README.md
Merge branch 'master' of github.com:stopsopa/ipromise

Conflicts:
	README.md