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

Conflicts:
	src/com/freedom/gameObjects/Robot.java
speciall for Ushakov
Merge branch 'master' of local repository into LevelInput

Conflicts:
	src/com/freedom/gameObjects/Box.java
	src/com/freedom/gameObjects/Stuff.java
	src/com/freedom/gameObjects/Tile.java