improved merging
Merge branch 'master' of https://github.com/ruiixu23/computational-intelligence