fixed some bugs in cardisplay
Merge branch 'master' of https://github.com/AaronMorton/Sorry_SoftwareEngineering

Conflicts:
	menuFunctions.js