Back to the stub.
Merge branch 'master' of github.com:fredollinger/jsquiz

Conflicts:
	index.html