Merge pull request #17 from brittkistner/comment_form

Migration conflict on master branch
more changes
more styling
fixed merge conflict
fixed merge conflict
Merge branch 'styling-feature' into new_develop
fixed merge conflicts