...
Merge branch 'gh-pages' of https://github.com/tysone/2014-columbia-projects into gh-pages

Conflicts:
	.DS_Store
merge