Cody
Merge branch 'master' of https://github.com/xldenis/stackqueue

Conflicts:
	templates/answer.html
	templates/score.html
Added