Merge pull request #1 from rcaracaus/jordan-changes

title change
Refactored code.
Merge pull request #2 from rcaracaus/refactoring

Refactored code.
Merge branch 'master' of https://github.com/rcaracaus/game2 into jordan-resetbutton

Conflicts:
	js/game.js