Merge branch 'master' of https://github.com/indigocode/walnut-flash-cards
Merge branch 'decklogic'
Working on BCrypt
Merge branch 'master' of https://github.com/indigocode/walnut-flash-cards
Merge branch 'master' of https://github.com/indigocode/walnut-flash-cards into decklogic
Merge branch 'master' of https://github.com/indigocode/walnut-flash-cards
Merge branch 'master' into decklogic