Merge branch 'master' into Ning_CharacterSelectTest
working on displaying words fed on the receipt
Merge branch 'fixingCards' into Ning_CharacterSelectTest

Conflicts:
	Unity Project/Unity Project.userprefs
Merge branch 'master' into Ning_scoreScreen
updated the score display in the receipt
Merge branch 'Ning_scoreScreen'