creating merge conflict from the other side
Merge branch 'master' of https://github.com/sebsier/test

Conflicts:
	test.c