new file:   test
Merge branch 'master' of https://github.com/davelehr/testrepos

Conflicts:
	test

	new file:   deploy.sh
	modified:   test
	new file:   test2