Integration
Merge branch 'master' of https://github.com/dreadnought303/MajorMayhem

Conflicts:
	core/src/com/mayhem/game/Bomber.java