Merge branch 'master' of https://github.com/rockasm/Test

Conflicts:
	README.md
cc
Merge branch 'master' of https://github.com/rockasm/Test