updating commenting in real time
real time comments are working
conflicts merged
Merged
Merge branch 'billy1339-comments_realtime'
Merge pull request #28 from laurenfazah/master

Merged conflicts