test
commit1
Merge branch 'master' of https://github.com/simokhalil/coloretto.git

Conflicts:
	test.c