client updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	COMP4985AndroidGPSAssignment3/src/main/java/com/example/comp4985androidgpsassignment3/ClientActivity.java
client updated