Merge branch 'master' of https://github.com/audibleblink/flashcardsv2 into user_migration
new routes/redirects and navbar links
Merge branch 'user_migration'