git commit -a  GPSGames&Server/Echo/.classpath
git commit -a   GPSGames&Server/GPSGames/src/edu/virginia/cs/sgd/gpsgames/GameController.java
git commit -a   GPSGames&Server/GPSGames/src/edu/virginia/cs/sgd/gpsgames/ReaderThread.java
Merge branch 'master' of https://github.com/SGD-GPSGames/GPSGames

Conflicts:
	GPSGames&Server/GPSGames/src/edu/virginia/cs/sgd/gpsgames/GameController.java