final changes for the night
Merge branch 'master' of https://github.com/nyentek/nyentek.github.io into connor_dev