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