flux styling
Merge branch 'develop' of github.com:42Zavattas/TechnoGarden into develop

Conflicts:
	app/styles/main.scss
indenting