first commit
Merge branch 'master' of https://github.com/fmaanster/moongit
Merge branch 'master' of https://github.com/fmaanster/moongit
Merge branch 'master' of https://github.com/fmaanster/moongit
Changed text2
This has been commited.

Merge branch 'master' of https://github.com/fmaanster/moongit

Conflicts:
	John_test.txt