Model fixes
Merge branch 'master' of https://github.com/TSantala/ECE-496-RISC

Conflicts:
	src/server/ObjectClient.java