Merge branch 'master' into allen
Merge branch 'master' into allen
Merge branch 'master' into allen
working on speech right now
fix route size
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013
adding speach recognition
Fix bug where cannot run two consecutive routes
Merge branch 'jake'
fixing conflict
adjust picture alignment
unstable version of speed recognition
Integrate collision detection to MainActivity
Merge branch 'prakhar'
Additional UI changes.
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013
Adding restart button
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013
Merge branch 'jake'
fixing conflict