Modified displayquestions.html in order to do input validation
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet

Conflicts:
	static/js/index.js
	sunstreet/templates/botvin/index.html