umieranie
Merge branch 'master' of https://github.com/mikomize/compo-2013

Conflicts:
	maps/main.json
	maps/main.tmx
	resources/gfx/general/general.png
	resources/gfx/general/general.xml
	src/models/GameModel.as