Small changes to loc
Merge branch 'felix1' of https://github.com/cerathe/maslab-2014 into felix1
Merge branch 'felix1' of https://github.com/cerathe/maslab-2014 into felix1
ah
Merge branch 'felix1' of https://github.com/cerathe/maslab-2014 into felix1

Conflicts:
	Derpbot/src/edu/mit/felixsun/maslab/PointTrackState.java
Merge branch 'felix1' of https://github.com/cerathe/maslab-2014 into felix1

Conflicts:
	Derpbot/src/edu/mit/felixsun/maslab/Localization.java
	Derpbot/src/edu/mit/felixsun/maslab/Main.java
	Derpbot/src/edu/mit/felixsun/maslab/PointTrackState.java
Fixed sign error in motor direction.  Working on ironing out kinks in ball-following