didnt change anything here
fixes merge conflicts
modifies seeds.rb to change assignment type to assignment category attribute
Merge branch 'master' of github.com:vaidehijoshi/Clipboard