test commit
fixing the deleted file
Merge branch 'master' of github.com:sdorfmei/gitting

Conflicts:
	AnotherFile.txt