Add code to add/remove/show comments
Merge branch 'upstream/master' into comments
Merge pull request #47 from boom1992/comments

Add code to add/remove/show comments