Merge branch 'oliverreedwong-jekyll' into jekyll

mwiley · mwiley · commit d8e0d388a2b3 · 2015-03-06T13:45:56.000-08:00
Conflicts:
	_data/members.yml
diff --git a/_data/members.yml b/_data/members.yml
@@ -31,3 +31,8 @@
   title: member
   github_username: swhitsett
   website: mrsammyw.com
+
+- name : Oliver Wong
+  title: Member
+  github_username: oliverreedwong
+  website: http://oliverreedwong.com
