What the hell?
Merge branch 'master' of https://github.com/erasimos/tamagos13.git

Conflicts:
	tamago/src/tamago.java