Added view question
Merge branch 'master' of https://github.com/erboyle/snapp into erboyle-master

Conflicts:
	app/controllers/application_controller.rb