initial commit
set up js libraries for map
customizing the map
Fixed compilation errors for map js files; added scripts to initializers/assets.rb
fixed compilation errors for map js files
minor changes
Merge pull request #10 from TIYA-Durham-GDI/activeadmin

Activeadmin
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4
Set up json proxy route for meetup data

GET /meetups/[id].json
Add info for setting API key to README
Merge pull request #11 from TIYA-Durham-GDI/Styling

Styling
Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4
Merge branch 'master' into map

Conflicts:
	app/assets/stylesheets/modules.css.scss
	app/views/home/index.html.erb
Merge branch 'map'
Merge branch 'meetup-proxy'

Conflicts:
	config/initializers/meetup_client.rb
	db/schema.rb
Add leader bios to seed data
Populate bios on location pages
Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4 into Styling

Conflicts:
	app/assets/stylesheets/modules.css.scss
	app/views/home/index.html.erb
	db/schema.rb
Merge branch 'master' into Styling

Conflicts:
	app/views/locations/show.html.erb
	db/schema.rb
	db/seeds.rb