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