commit with "on the fly" merge
Merge branch 'master' of ssh://git@github.com/aleksz/git-tricks.git

Conflicts:
	src/ee/ignite/MySuperClass.java