README.md edited online with Bitbucket
README.md edited online with Bitbucket
stuff
Merge branch 'master' of https://bitbucket.org/lagrz/atmc_service_locations

Conflicts:
	README.md