readme modfy
Merge branch 'master' of https://github.com/hsopanen/waste_server

Conflicts:
	README.md