Addition and subtraction demonstrating conditional statements
Merge branch 'master' of github.com:njpayne/jacobi