Merge animation-->master
merge again
Merge branch 'master' of https://github.com/Mathgoat/square-loot.git

Conflicts:
	src/environment/room/OxygenRoom.java
	src/environment/room/Room.java