landing page
Merge branch 'master' of https://github.com/gt-big-data/hack-night-1-ui

Conflicts:
	public/about/index.html
merge