Layout Changes
Merge branch 'layout' of https://github.com/tsmithNeuone/calendar

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/calendar/index.html.erb
	app/views/events/show.html.erb
	app/views/layouts/application.html.erb
layout merged, adding devise