strike lightning and more explosions from torch
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/omari/SuperPowers/SuperPowers.class