Gemfile locked
Merge branch 'master' of https://github.com/nairys/web_flashcards
Merge branch 'master' of https://github.com/nairys/web_flashcards
Changed some style elements
Merge branch 'master' of https://github.com/nairys/web_flashcards
Corrected conflicts
Merge pull request #23 from nairys/styling

Styling