last minute changes from last night
Merge branch 'master' of github.com:igirard/igirard.github.io

forgot to run final commit/push from laptop last night, made a bunch of changes from desktop this morning
fixed merge issues and other minor bugs