Tried to fix the bug...This is what I have so far.
Merge branch 'master' of https://github.com/slannigan/syde348

Conflicts:
	gamePlay.html