building flashcards and difficulty
merging
Merge branch 'master' of https://github.com/kaganriedel/Mathletes

Conflicts:
	Mathletes/Base.lproj/Main.storyboard
	Mathletes/MathViewController.m