Size testing, multiple emitter points
Merge branch 'master' of https://github.com/BBensch/Flak-Cannon

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