README
Merge branch 'master' of github.com:xilix/apitest

Conflicts:
	README.md
README