partial recommendation engine setup
Merge remote-tracking branch 'origin/user-flow' into recommandations

Conflicts:
	app/models/user.rb
	db/seeds.rb
update seeds file
update seeds
ad names dir
Merge remote-tracking branch 'origin/name_parser' into recommandations

Conflicts:
	db/seeds.rb
Merge remote-tracking branch 'origin/name_parser' into recommandations
no visible changes made
fixed merge conflict
Merge pull request #3 from shamrockit/name_parser

Name parser
update seeds
create users
Merge remote-tracking branch 'origin/master' into recommandations

Conflicts:
	app/models/user.rb
	db/seeds.rb
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 :-(
bootstrap and initial styles
Merge branch 'master' into facebook

Conflicts:
	app/helpers/application_helper.rb
	app/models/user.rb