slight changes that I don't remember
Merge branch 'master' of https://github.com/fiddler-crabs-2014/Awesome-Flashcards into JohnathanW
Putting it all together
Merge pull request #37 from JohnathanWeisner/PuttingItAllTogether

Putting it all together