We now have a website that makes my eyes feel good.
Merge branch 'master' of https://github.com/stuycs-softdev/folio
Did some tidying up of temp files