Merge branch 'master' of github.com:akinaru/websocket-java

Author: bertrandmartel

README.md

@@ -1,8 +1,8 @@
-# Websocket Java Server implementation #
+# Websocket Java Server/Client implementation #
 
 http://akinaru.github.io/websocket-java/
 
-Websocket Server implementation
+Websocket Server/Client implementation
 
 This project uses HTTP endec project : http://akinaru.github.io/http-endec-java/