Merge branch 'master' into prakhar
Merge branch 'master' into prakhar
slowing down the ball :)
update path package
Adding Speed tag.
Merge branch 'prakhar'
Merge branch 'master' into allen
deleting the path
adding heristics to sphero to make it roll further before making full stop
adding calibration
Merge branch 'master' into prakhar
finishing caliberation
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013 into allen
Merge branch 'allen'
Integrating Gooi's changes'
merge step one
Merge branch 'master' into prakhar
Changing color on collision.
Merge branch 'prakhar'
Changes in the local map UI