some data models and view models
Merge branch 'master' of https://github.com/Codeberry-Black/code-quiz

Conflicts:
	webclient/public/scripts/app/main.js