Upvotes down workin
Merge branch 'master' of https://github.com/eyvindn/khanquestions

Conflicts:
	views/create.jade
	views/index.jade