?
Merge branch 'master' of https://github.com/sweapon/kake

Conflicts:
	prosjekt/.classpath
Merge branch 'master' of https://github.com/sweapon/kake

Conflicts:
	prosjekt/.classpath