walls fucked up...
Merge branch 'master' of https://github.com/daansteegmans/EXP-GAME

Conflicts:
	src/Background.cpp
	src/Backgrounds.cpp
	src/Oxygen.cpp
	src/Walls.cpp