helll
Merge branch 'master' of https://github.com/PrashanthKumarM/spock

Conflicts:
	app/controllers/surveys_controller.rb