updating README
Merge branch 'master' of https://github.com/MechanicalNun/Server-app

Conflicts:
	README.md