Merge branch 'clientServer' of https://github.com/CMPUT301W14T13/Team13GPSCommentLogger into ClientServer

Conflicts:
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentlogger/controller/ClientController.java
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentlogger/controller/ClientDispatcher.java
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentlogger/controller/ClientListener.java
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentlogger/controller/ServerController.java
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentlogger/controller/ServerDispatcher.java
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentlogger/controller/ServerListener.java
Merge branch 'ClientServer' into clientServer