Merge github.com:Spooner/stampr-api-python

Conflicts:
	README.md