Fixed shotty user adding
Merge branch 'gh-pages' of https://github.com/angelabair/HackRPI-2014 into gh-pages