Fixed the resources/drag and drop page conflicts.
Merge pull request #15 from brittkistner/fix-styling

Fixed the resources/drag and drop page conflicts.
Merge pull request #16 from brittkistner/develop

Merge Develop Branch with Master
merge 1148
Merge branch 'master' of github.com:brittkistner/group-project-base into comment_form
recreated migration files
Merge pull request #17 from brittkistner/comment_form

Migration conflict on master branch
fixed merge conflict