Hooked up y=x and y=-x
Merge branch 'master' into gh-pages
updated