formatting
Merge branch 'master' of https://github.com/mwong56/hackergames2014
fuck me