Merge branch 'master' of https://github.com/FlatsWire/api

Conflicts:
	README.rst