Visu Question
Merge branch 'master' of https://github.com/youchief/questionme

Conflicts:
	app/webroot/css/default.css
	app/webroot/js/app.js