git push
no worries Merge branch 'master' of https://github.com/JenBright/test

Conflicts:
	test.txt