index
event types
attempt at chaning map markers
Merge branch 'master' of https://github.com/madelinec/eventus

Conflicts:
	app/controllers/welcome_controller.rb
	app/views/welcome/index.html.erb