linux version
Merge branch 'master' of github.com:Jade-Shan/test-conf

Conflicts:
	README.md