Added some score-keeping functionality
Merge branch 'Francisco'

Conflicts:
	script.js
Merge branch 'sen' of https://github.com/senlin13gt/Its_Spring_2014
Beautified a little bit for Surya
Merge branch 'master' of https://github.com/senlin13gt/Its_Spring_2014

Conflicts:
	script.js