Adding template arguments for the nonlinear functions
Merge branch 'master' of https://github.com/rappoccio/PHY410