merge
Merge branch 'master' of https://github.com/imorrison/QuestionsMapper

Conflicts:
	user.rb
Missing ' is seed.sqp