updates on front-end 2
Merge branch 'master' of github.com:lindseytang/HackPrinceton