score.js

added score.js, added a few lines to html and to logic.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	Main/code/javascript/logic.js
	Main/resources/html/game.html