create users and 2 decks for seed file
created basic seed file without guesses
fixed conflicts
pre merge check
fix conf
Merge branch 'master' of https://github.com/avifoxi/GOLDFINGERhasflashcards
resolving such conflict
resolving conf
resolve conf