Int conversion protection
Merge branch 'master' of https://github.com/uj-robotics/Krakrobot2014Qualifications

Conflicts:
	defines.py