update
Merge branch 'master' of https://github.com/mheinrich94/try_git

Conflicts:
	test2.txt