Minor adjustments
Merge branch 'master' of https://github.com/pclary/Micromouse2014

Conflicts:
	Micromouse/Micromouse.ino