added explosions
Merge remote-tracking branch 'origin/master'

Conflicts:
	Processing/src/Proc.java