commit
Merge branch 'master' of
https://github.com/garyodonoghue/belfast-hackathon.git

Conflicts:
	core/src/main/java/com/ladinc/core/screens/GameScreen.java