Alarez
Merge branch 'master' of https://github.com/Larios94/Star-Quiz

Conflicts:
	www/js/menu.js