Merged all the modules except subtractor.
Merge branch 'master' of github.com:bhzunami/FHNW