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

Conflicts:
	target/classes/META-INF/maven/ca.ulaval.glo3100.e2014.team21/tp2/pom.properties
	target/classes/roles/Client.class
	target/classes/roles/Server.class
	target/classes/utilities/ECipher.class