Advances in lots of fucking stuff
Merge branch 'master' of github.com:canalesb93/eavesdrop

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