made code less wet and various improvements
Merge branch 'gh-pages' of github.com:princetoneclub/hackprinceton into gh-pages