Слияние
Merge branch 'master' of https://github.com/CoolGuys/Freedom.git

Conflicts:
	src/com/freedom/gameObjects/Door.java
Merge branch 'master' of https://github.com/CoolGuys/Freedom.git

Conflicts:
	src/com/freedom/gameObjects/Button.java
	src/com/freedom/gameObjects/Wall.java
Merge
Merge branch 'master' of https://github.com/CoolGuys/Freedom.git

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