added matches algorithm and filtering based on preference and age
Merge branch 'KyleR'
"merged matching functions and filtering by preference and age"
Conflicts:
	Gemfile
	app/assets/javascripts/app/controllers.js
	app/controllers/users_controller.rb
	app/views/users/show.html.erb
	dump.rdb