Fix bug where cannot run two consecutive routes
Merge branch 'jake'
adjust picture alignment
Integrate collision detection to MainActivity
Adding restart button
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013
Merge branch 'jake'
fixing conflict