Merge pull request #1 from nyentek/connor_dev

Connor dev
Merge branch 'master' of https://github.com/nyentek/nyentek.github.io into connor_dev