pre merge commit
Merge branch 'master' of https://github.com/PhillyQc/tp2

Conflicts:
	src/main/java/roles/Client.java
	src/main/java/utilities/ECipher.java