my great documentation
Merge branch 'master' of github.com:den7uck/megaquiz

Conflicts:
	quizobjects/User.php