Merge branch 'dev'
-rw-r--r-- 79 .gitignore
-rw-r--r-- 35179 LICENSE.txt
-rwxr-xr-x 675 README.md
drwxr-xr-x - client
-rw-r--r-- 256 package.json
drwxr-xr-x - server