final presentation
Merge branch 'master' of https://github.com/team-six/industrialexperience

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