Gemfile.lock update
Merge branch 'master' of https://github.com/upfrontwichita/upfrontwichita.com
Merge branch 'master' of https://github.com/upfrontwichita/upfrontwichita.com
Merge branch 'master' of https://github.com/upfrontwichita/upfrontwichita.com
Merge branch 'authentication'
Merge
Merge conflicts
Swapped out bootstrap for foundation
Removed bootstrap files
Added a new font set for social icons.  Began work on internal home page styling and layout as well.
Rearranged some elements on home page and in application.html.erb and css as I continue to build out the page structure
add preview images for events
began tweaking top-banner
Merge branch 'home-layout'

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
	app/views/welcome/index.html.erb
	config/routes.rb