Corrected commit

Conflicts:
	src/main/java/org/nhl/containing_backend/Communication.java
	src/main/java/org/nhl/containing_backend/Controller.java
	src/main/java/org/nhl/containing_backend/Main.java