lots of changes, not really done yet...
Merge branch 'master' of github.com:jieter/computational-intelligence