adding setUpRoute
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013
Merge branch 'prakhar'
Added App icon/label.
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013
Merge branch 'master' into prakhar