Merge branch 'CSS-Work'
Merge branch 'master' into CSS-Work
Added more assets