Added everything to repo what do?
Merge branch 'master' of github.com:escherize/cljs-quiz

Conflicts:
	quiz-data.txt