changed colors....again
Merge branch 'master' into styling

Conflicts:
	app/views/events/index.html.slim
merge
created modal form window
modal styles
Obligatory style changes to modal
Obligatory style changes to modal
Obligatory jschanges to modal
cleaned up modal scripts and added a notification method.