second attempt
Merge branch 'master' of http://github.com/cjaneyes/cjaneyes.github.com