Implemented point calculations
Merge branch 'master' of https://github.com/JoePorpeglia/jeopardy

Conflicts:
	assets/js/jeopardy.js
	index.html