Merge pull request #4 from shamrockit/recommandations

Recommandations
commit the shit out of it
added 'matches' temporary method, also added matched names to names#index view
Merge pull request #5 from shamrockit/users

not a very pretty commit :-(
Merge remote-tracking branch 'origin/master' into recommandations

Conflicts:
	app/models/choice.rb
	app/models/user.rb