Sass working now
Merge branch 'master' of https://github.com/BintLopez/fedupload

Conflicts:
	app.js
	styles/css/layout.css.map
Git conflict resolved
Sass update on fontstyling to match LVP