no message
Merge branch 'master' of https://github.com/Brkk/TextShare

Conflicts:
	src/com/uvic/textshare/TextShareServlet.java
	war/WEB-INF/classes/com/uvic/textshare/TextShareServlet.class