Finished the comments
Merge branch 'master' of https://github.com/ronnienv/thoughts

Conflicts:
	app/views/comments/edit.js.coffee