Merge branch 'master' of https://github.com/upfrontwichita/upfrontwichita.com

Conflicts:
	app/views/layouts/application.html.erb
	config/routes.rb
Merge branch 'master' of https://github.com/upfrontwichita/upfrontwichita.com into events

Conflicts:
	app/views/layouts/application.html.erb
Event resource created, sync method in place, routes added.
Events being pulled from Meetup API, synced locally.
Styling changes to homepage.
Synced events pulling into homepage.
Merge branch 'master' of https://github.com/upfrontwichita/upfrontwichita.com

Conflicts:
	Gemfile
	db/schema.rb