All goooood
Merge branch 'master' of https://github.com/daansteegmans/EXP-GAME

Conflicts:
	bin/data/background/space.jpg
	src/Background.cpp
	src/Backgrounds.cpp
	src/Oxygen.cpp
	src/Walls.cpp