add 7777
Merge branch 'master' of https://snut97@github.com/snut97/dev.git

Conflicts:
	test/src/aaa.txt