updated with ijcnn 2014
Merge branch 'master' of https://github.com/gditzler/gditzler.github.io