Start of adding comments
Merge branch 'master' into add-comments
Merge branch 'master' into add-comments

Conflicts:
	src/client/data.coffee
	src/server/server.coffee
Merge branch 'master' into add-comments
XMerge branch 'master' into add-comments

Conflicts:
	bin/db_setup
	src/view.coffee
debugged fetching comments