explicit ids
Merge branch 'master' of https://github.com/dyarosla/mathbacon

Conflicts:
	mathbacon/templates/testjs.html
Rounding out 200 commits
Merge branch 'master' of https://github.com/dyarosla/mathbacon

Conflicts:
	mathbacon/settings.py
added setimeout
Merge branch 'master' of https://github.com/dyarosla/mathbacon
hack to fix swap answer lines
fix qid off by 10 on new quetions bug