test it
Merge branch 'mybranch_remote' of https://github.com/jasonctest/test into mybranch_remote

Conflicts:
	newtest.txt
Merge branch 'mybranch_remote' of https://github.com/jasonctest/test into mybranch_remote