added error checking on the client side for user input
work in progress for writing and reading
Merge origin/master

Conflicts:
	TFS/src/client/Client.java
	TFS/src/servermaster/ServerMaster.java