Test adding a new file
modified the file
Merge branch 'master' of https://github.com/sdorfmei/gitting

Conflicts:
	AnotherFile.txt