nothing serious
Merge branch 'master' of https://github.com/CoolGuys/Freedom

Conflicts:
	src/com/freedom/gameObjects/Robot.java