Merge branch 'master' into allen
Merge branch 'master' into allen
Merge branch 'master' into allen
working on speech right now
Update picture with compass
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013
fix route size
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013
adding speach recognition
Merge branch 'jake'
fixing conflict
adjust picture alignment
unstable version of speed recognition
Merge branch 'master' into prakhar
Having backup of route_02
Merge branch 'master' into prakhar
Renaming route_02_backup to route_02.png
Merge branch 'prakhar'
Additional UI changes.
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013