fix conflict text
Merge branch 'master' of github.com:stianfauskanger/ggj14

Conflicts:
	src/com/galacticgoat/lightsquirter/GameScreen.java