Gemfile locked
Merge branch 'master' of https://github.com/nairys/web_flashcards
Merge branch 'master' of https://github.com/nairys/web_flashcards
Merge pull request #21 from nairys/statistics

more refactoring done and also added empty round flusher
Multiple edit fields
Merge branch 'master' into Edit_Cards
Changed some style elements
Merge pull request #22 from nairys/Edit_Cards

Edit cards
Merge branch 'master' of https://github.com/nairys/web_flashcards
Corrected conflicts
Merge pull request #23 from nairys/styling

Styling
Update README.md
conflicts resolved and more refactoring