Added stuff to the text client
Merge branch 'master' of github.com:PetarV-/CSTIB-Echo
Merge branch 'master' of github.com:PetarV-/CSTIB-Echo

Conflicts:
	text-client/src/main/java/uk/ac/cam/echo/textClient/Main.java