claims I have conflicts when I don't
Merge branch 'master' of https://github.com/130610/sd-project

Conflicts:
	source/koala.cpp