I think I fixed something
Merge branch 'master' of https://github.com/kelleyb/SwagTracker

Conflicts:
	app/views/companies/index.html.erb
	app/views/events/index.html.erb