commiting map changes before post GIS
added more filtering for distance from
Merge branch 'KyleR'
all locations displaying on google maps
removing migration file
precompiled
precompiled
Merge branch 'kaitlin2'
mergin in maps and corrected api routes
Conflicts:
	Gemfile.lock.orig
precompiled
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
Setup matches display and requests, styled user profiles, and updated navbar