merging..
Merge branch 'master' of github.com:Ynzl/nonlin
Merge branch 'master' of github.com:Ynzl/nonlin
octave stuff
..