committing before trying to merge
Merge branch 'master' of https://github.com/plexiboy/MyRepo

Conflicts:
	git_test.txt