Merge pull request #17 from brittkistner/comment_form

Migration conflict on master branch
working on comments backend