Pushing minor changes to controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/sep2/grp2/client/Controller.java
Merge remote-tracking branch 'origin/master'
Finishing GUI in ViewImpl (for now)