First commit. Added hello world to repository.
blah
newfile
blah
changed master
Merge branch 'feature_1'

Conflicts:
	test.txt
Merge branch 'master' of github.com:janelange/Test