Update README.md
Merge branch 'master' of github.com:AECPlaneteers/server

Conflicts:
	README.md