---
Merge branch 'master' of github.com:jclakkis/shmuppi

Conflicts:
	shmuppi/src/main/java/objektit/Tyyppi.java