ändrat en rad
Merge remote-tracking branch 'origin/master'

Conflicts:
	tamago/src/tamago.java