stylish, improving modules
Merge branch 'develop' of github.com:42Zavattas/intra into develop

Conflicts:
	app/styles/main.scss