Merge branch 'master' into allen
deleting the path
adding heristics to sphero to make it roll further before making full stop
adding calibration
finishing caliberation
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013 into allen
Merge branch 'allen'
Merge branch 'prakhar'
Changes in the local map UI
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013
Merge branch 'master' into prakhar