added taken survey counters
Merge branch 'master' into validations

Conflicts:
	app/views/homepage.erb
validations with error messages on page
Merge branch 'master' into validations

Conflicts:
	app/controllers/survey.rb
	app/models/survey.rb