friday test 1
test1 from wednesday
changes
Merge branch 'master' of github.com:bock31/july-17-test

Conflicts:
	test1.txt