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

Conflicts:
	app/src/main/java/kamikaze/team/flakcannon/DisplayShowActivity.java
Merge branch 'master' of https://github.com/BBensch/Flak-Cannon

Conflicts:
	app/src/main/java/kamikaze/team/flakcannon/DisplayShowActivity.java
Merge branch 'master' of https://github.com/BBensch/Flak-Cannon

Conflicts:
	app/src/main/java/kamikaze/team/flakcannon/DisplayShowActivity.java
Merge branch 'master' of https://github.com/BBensch/Flak-Cannon

Conflicts:
	app/src/main/java/kamikaze/team/flakcannon/DisplayShowActivity.java
	app/src/main/java/kamikaze/team/flakcannon/fireWorks.java

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

Conflicts:
	app/src/main/java/kamikaze/team/flakcannon/DisplayShowActivity.java
	app/src/main/java/kamikaze/team/flakcannon/fireWorks.java

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

Conflicts:
	app/src/main/java/kamikaze/team/flakcannon/DisplayShowActivity.java
	app/src/main/java/kamikaze/team/flakcannon/fireWorks.java

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

Conflicts:
	app/src/main/java/kamikaze/team/flakcannon/DisplayShowActivity.java
	app/src/main/java/kamikaze/team/flakcannon/fireWorks.java

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

Conflicts:
	app/src/main/res/layout/activity_fire_works_selecrion.xml