Merge pull request #35 from dancingshell/Brandon

Added Google Maps and fixed Facebook session redirects
added block and accept requests for chatting, filtering just for friends
Merge branch 'KyleR'

"added block and accept for matches, filter just by friends"

Conflicts:
	Gemfile.lock
	app/assets/javascripts/app/controllers.js
	app/controllers/users_controller.rb
	app/views/users/show.html.erb
	db/schema.rb
added basic setup for rspec
Merge branch 'master' of https://github.com/dancingshell/MixnMatch

Conflicts:
	Gemfile.lock
Updated navbar links and avatar
Merge branch 'master' into Brandon
Getting up to date.
Updated artist displays and added user artist create and destroy controls