changes in anotherfile.txt
Merge branch 'master' of github.com:niht/hello-world

Conflicts:
	anotherfile.txt
changed some text in anotherfile.txt