copied new code and cleanup; new version of the system
Updated code commenting and removed some functions which are only called once
Merge branch 'master' of github.com:debolk/deursoos