Commenting
Merge branch 'master' of https://github.com/tylerb88/FlashCards

Conflicts:
	ScoreCalc.java