Prev to pull
Merge branch 'master' of https://github.com/canalesb93/eavesdrop
Merge branch 'master' of https://github.com/canalesb93/eavesdrop

Conflicts:
	app/assets/stylesheets/application.css.scss
Front end and else
Merge branch 'master' of https://github.com/canalesb93/eavesdrop