- explosion
Merge branch 'master' of https://github.com/esenti/labshooter

Conflicts:
	src/Level.cpp
Merge branch 'master' of https://github.com/esenti/labshooter