mostly done
Merge branch 'master' of https://github.com/trevethan-admin/trevethan-admin.github.io