change urls for new server
Merged readme