adding what was in mater to push to production
Merge branch 'master' into gh-pages
loaded all the assets as needed