Updated navbar links and avatar
Merge branch 'master' into Brandon
Getting up to date.
finished messaging between users
Merge branch 'KyleR'
Updated artist displays and added user artist create and destroy controls
Merge pull request #36 from dancingshell/Brandon

Updated artist displays and added user artist create and destroy controls
added more filtering for distance from
Merge branch 'KyleR'
removing migration file
precompiled
precompiled
Merge branch 'kaitlin2'
mergin in maps and corrected api routes
Conflicts:
	Gemfile.lock.orig
precompiled
Started implementation of matches into static#index and updated navbar
Merge pull request #37 from dancingshell/Brandon

Started implementation of matches into static#index and updated navbar
added production yml info for chat
Merge branch 'master' of https://github.com/dancingshell/MixnMatch
precompiled
calls facebook and spotify artists from their own methods
calls facebook and spotify artists from their own methods with redirects