development mode
Merge branch 'master' of https://github.com/kaxi1993/Quizzes

Conflicts:
	README.md
change environment
Merge branch 'master' of https://github.com/kaxi1993/Quizzes