Merge pull request #48 from nealcpeters/styling

Styling
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into styling