stuff
Merge branch 'gh-pages' of https://github.com/HackNC/Fall2014 into gh-pages