use rpsec
use factory girl
Merge branch 'master' of github.com:gurix/railsurvey

Conflicts:
	Gemfile