facebook login added and working
removed some validations we didnt need and fixed fb login
bootstrap and initial styles
Merge branch 'master' into facebook

Conflicts:
	app/helpers/application_helper.rb
	app/models/user.rb
worked on styles
Merge pull request #6 from shamrockit/facebook

Facebook
getting back on track...
added 'require open-uri' to user model
added 'names you like' feature to user show page
added 'destroy' method to choices controller
changed 'liked_names' method in user model to 'positive choices' method; now it returns liked choices instead of liked names
added 'delete choice' button to user show profile, and changed names list to a table
Merge pull request #7 from shamrockit/users2

Users2
find name matches (partner and self both like)
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