Added a comments app
Merge conflict resolved