change to readme
Merge branch 'master' of github.com:sqpdln/test

Conflicts:
	README.md