'shell'
Merge branch 'master' of https://github.com/friedeggs/icys

Conflicts:
	bin/icys/java/Game.class
	bin/icys/java/PolarBear.class

'lol stash gives an error'