omfg time is out
Merge remote-tracking branch 'origin/master' into recommandations

Conflicts:
	app/models/choice.rb
	app/models/user.rb
erp
Merge remote-tracking branch 'origin/master' into bugfix
Merge branch 'bugfix' into recommandations

Conflicts:
	app/models/choice.rb
	app/models/user.rb
	db/seeds.rb
remove unused files
create user unless 2 or more
correct match function
Merge pull request #9 from shamrockit/recommandations

Recommandations
fast seed(< 1 sec) from names_dump instead of text files
move specs
update for changed validations
add choices controller spec skeleton
lookup by correct attribute
Merge pull request #10 from shamrockit/recommandations

fast seed(< 1 sec) from names_dump instead of text files
Merge pull request #11 from shamrockit/specs

Specs
added newline after each choose link on user index page
added 'if user.partner_id.nil' check to 'pick your partner' link
Merge branch 'master' into users2
added ruby version to Gemfile