updated front end
Merge branch 'master' of github.com:lindseytang/HackPrinceton