Updated client constructor
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/src/photobooks/objects/Client.java