changed from tom and glom
Merge branch 'gh-pages' of github.com:LiTHehack/Hack-out-for-Summer-2014 into gh-pages