Nightly
Blah
Merge branch 'felix1' of https://github.com/cerathe/maslab-2014 into felix1

Conflicts:
	Derpbot/src/edu/mit/felixsun/maslab/Main.java
	MaslabComm/comm/BotClientMap.java
Trying to see wall stripes