Comment retrieval
Merge branch 'Comment_retrieval'

Conflicts:
	package.json
	views/index.html
	views/layout.html