Merge branch 'quincy'
Merging branch
added categories to seed file
Merge branch 'quincy'
Merging branch
added angular
Merge branch 'Kaitlin'
Merge branch 'master' of https://github.com/dancingshell/Wefridgerator
Removed bug