Demo of equations pretty-print
Merge branch 'master' of github.com:tobin/Elektrotickle
Improve parsing of complex poles/zeros (addresses issue #1)
For some reason, the code for parsing complex poles and zeros
was inside of the code block that added additional poles and
zeros (beyond the first specified).  As a result, if the first
pole (or zero) to be specified was complex, it would not be
parsed correctly.
Resolve merge conflict