dev
Merge branch 'dev' of github.com:CangWolf/mygit into dev

Conflicts:
	test.txt
github merge dev