Merge branch 'master' of https://github.com/skortchmark9/riMap

Conflicts:
	src/client/Client.java
	src/shared/NeighborsResponse.java