Settings Page
Merge branch 'gh-pages' of https://github.com/aluminous/hcc2014 into gh-pages