did i switch servers
Merge branch 'master' of https://github.com/julcar311/testServer

Conflicts:
	README.md
again trying after merge errors