1
Merge https://github.com/heierj/chatterspot

Conflicts:
	Back End/src/Server/ClientHandler.java
	Front End/res/layout/activity_login.xml
	Front End/src/Client/ChatClient.java
	Front End/src/com/example/chatterspot/ChatActivity.java
fixed merge
fixing ghost conflicts