Fixed conflicts
Merge branch 'master' of
https://github.com/UCSD-CSE110-TEAM3/Chat-App.git

Conflicts:
	ChatClient/src/main/java/edu/ucsd/cse110/client/Gui/MainWindow/UserDisplayPanel.java
	ChatServer/src/main/java/edu/ucsd/cse110/server/Server.java
Merge branch 'master' of https://github.com/UCSD-CSE110-TEAM3/Chat-App.git