making spaghetti
Merge branch 'master' of github.com:Dglgmut/coleoid

Conflicts:
	README.md