a
a
a
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay

Conflicts:
	app/assets/stylesheets/home_stylesheet.css
Merge pull request #28 from nealcpeters/AlexTestBranch

Alex test branch