It shows!
Merge branch 'master' of https://github.com/friedeggs/icys
Merge?
Aiya
Oh no
Merge branch 'master' of https://github.com/friedeggs/icys

Conflicts:
	bin/icys/java/Block.class
	bin/icys/java/Mode.class
	bin/icys/java/Utilities.class

git commit