I put my name
Resolved conflict

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/foreza/ProjectFoodRunVDGC