commit after change from local and remote
Merge branch 'master' of https://github.com/palmer2013/testpj

Conflicts:
	test1

conflict merge done.