Merge pull request #2 from stedes/master

started on chat app