Merge Jeremy's Work & Maria's Work

made backup of jeremys  code game.py.bak can be deleted if all goes
well.