Merge pull request #1 from lbrentcarpenter/master

try to fix weird x^2 + + 5 bug
Merge pull request #2 from lbrentcarpenter/gh-pages

Merge pull request #1 from lbrentcarpenter/master