1
Merge branch 'master' of https://github.com/Cubbic/milionar_web

Conflicts:
	www/js/intrebari.js
	www/js/milionar.js