Second commit
Merge branch 'master' of https://github.com/DesignAShirt/angular-socket-chat

Conflicts:
	README.md