Refactoring
Fixed stashed changes
Merge branch 'master'

Conflicts:
	assets/css/style.css
	assets/css/style.css.map
	quest.php