Dealingwith sorting ok
Users show up sorted by score, location, and gender

* You only see people who you want to see (and who want to see you)
Merge branch 'HomePage'

Conflicts:
	app/models/user.rb
	app/views/favorites/index.html.haml