First Commit
Merge branch 'master' of github.com:snoz2191/Play-Angular-Socket-Server

Conflicts:
	README.md
Merge branch 'master' of github.com:snoz2191/Play-Angular-Socket-Server