merge
Merge branch 'master' of https://github.com/abe-austin/Catan
some stuff that needed to be added just to get more commits
Merge branch 'master' of https://github.com/abe-austin/Catan

Conflicts:
	java/src/client/serverProxy/ServerResponseConverter.java