Merge branch 'allen'
Adding 4 main buttons.
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013