asdfsadf
Merge branch 'master' of https://github.com/tylerbates/boilerplate

Conflicts:
	.idea/boilerplate.iml
	app/code/local/Oggetto/Questions/Model/Question.php
	app/code/local/Oggetto/Questions/controllers/IndexController.php
	app/code/local/Oggetto/Questions/etc/config.xml
	app/code/local/Oggetto/Questions/sql/questions_setup/install-1.0.0.php
check for git adequacy

[re #test_works]