3.1
Frederik
Merge remote-tracking branch 'origin/master'

Conflicts:
	KMKY/src/com/kmky/logic/Calculate.java