tuning this
tuning this some more
Merge branch 'master' of http://github.com/dustinmoorman/flashcards