seeded and added model associations
Merge branch 'master' of https://github.com/netelder/flashcardsp2 into loginlogic

This merge is necessary to commit changes.