Final commit for judging
Merge branch 'master' of https://github.com/jpshankle/americas_datafest

Conflicts:
	client/src/about/view.html