Merge branch 'master' of https://github.com/BBensch/Flak-Cannon

Conflicts:
	app/src/main/res/layout/activity_fire_works_selecrion.xml
Merge branch 'master' of https://github.com/BBensch/Flak-Cannon
The space fireworks is implemented
Merge branch 'master' of https://github.com/BBensch/Flak-Cannon