some fix
Merge branch 'master' of https://github.com/KernelCorp/fitauto

Conflicts:
	source/stylesheets/main.css.sass