Set default location for the client to be EC2 server.
Merge remote branch 'origin/master'