Initial commit
Merge branch 'master' of github.com:BlueGood/test

Conflicts:
	README.md