Ball search ignores wall stripes.
Merge branch 'felix1' of https://github.com/cerathe/maslab-2014 into felix1

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

Conflicts:
	Derpbot/src/edu/mit/felixsun/maslab/BallCollectState.java
	Derpbot/src/edu/mit/felixsun/maslab/Localization.java
	Derpbot/src/edu/mit/felixsun/maslab/PointTrackState.java
Added spiral and roller