Add creating and showing comments
Merge branch 'comments'