working flashcard models (hopefully done)
Merge branch 'master' into flashcards