first used
Merge branch 'master' of github.com:skytan/StompTest

Conflicts:
	README.md