local commit;
Merge branch 'master' of https://github.com/palmer2013/testpj

Conflicts:
	test1

comit after change local