methods 4-11 of client stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/client/Client.java