test1
test2
Merge branch 'feature'
Merge branch 'master' of https://github.com/mheinrich94/try_git.git

Conflicts:
	test2.txt
test3