Changed feedback mechanism
Merge branch 'master' of https://github.com/nmoroze/peer-edit