merge
Merge branch 'master' of https://github.com/Gabbe1993/Network_Programming_With_Java

Conflicts:
	Homework1/src/Peer/Connector.java
	Homework1/src/Peer/Peer.java
	Homework1/src/controller/Controller.java
emrge