final_style
Merge branch 'master' of github.com:danlinde/sifiapp

Conflicts:
	app/assets/stylesheets/application.css
	app/views/events/new.html.erb
Merge branch 'master' of github.com:danlinde/sifiapp

Conflicts:
	app/assets/stylesheets/application.css.erb