Add quiz block model
Merge branch 'master' of https://github.com/kriwil/labster

Conflicts:
	labster/models.py