adding score tracking back in
Merge branch 'master' of github.com:thinkthroughmath/WarmUpGamePrototype into pks/results_page/master
positioning the correct and incorrect items per round
finishing layout of results page

Signed-off-by: Paul Scarrone <pscarrone@thinkthroughmath.com>
Merge branch 'master' into pks/results_page/master

Conflicts:
	Session_1/public_html/js/GameScreen.js