resolved conflict
Merge branch 'sysode_docs' of github.com:KDMOE/sympy into sysode_docs