Edit Jim Jones
Merge pull request #88 from skyl/jim_jones

Edit Jim Jones
how did that get in there ...
Merge branch 'master' into gh-pages
update gh-pages