Changed to show difficult cards more regularly
Merge branch 'master' of https://github.com/patmood/flashcard

Conflicts:
	deck.rb