changed some constants so that we may begin testing requests from a remote server
Merge remote-tracking branch 'origin/master'