reconfigured for scorpion, hello world (again)
Merge branch 'master' of github.com:gnmerritt/gnmerritt.net