add factory girl and faker
Merge branch 'master' of https://github.com/brtr/mvp
modify offer
Merge branch 'master' of github.com:brtr/mvp

Conflicts:
	Gemfile.lock
	config/routes.rb
	db/schema.rb