adds pace and more
Merge branch 'master' of github.com:canalesb93/eavesdrop

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/events/index.html.erb