showScore
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/js/boxdemo.js
Merge branch 'master' of https://github.com/ihackson/ihackson.github.com