starting to work Thursday
Merge branch 'master' of https://github.com/hspinks/cs108

Conflicts:
	build/classes/messages/AcceptServlet.class
	src/messages/SendMessageServlet.java
delete friends