Initial commit to github
Merge branch 'master' of github.com:ahuimanu/CIDM4382