merging remote master
fixed UTF-8 encoding issue
merging remote master
added @import rules to manifest file
Set up json proxy route for meetup data

GET /meetups/[id].json
resolved merge conflict on home page
Merge branch 'map'
resolving merge conflicts
Merge branch 'meetup-proxy'

Conflicts:
	config/initializers/meetup_client.rb
	db/schema.rb
Add leader bios to seed data
Populate bios on location pages
minor changes
pulled remote master
Add underscore to gems
merging master
Add social media to bios
Add seeds for instructors
Put instructors on location show page
Merge branch 'leaders'
Remove gemfile.lock