popup removed
merge from hell
Merge branch 'master' of https://github.com/martim00/ludumdare30

Conflicts:
	l30/source/PlayState.hx