first commit
Merge branch 'joeBranch'
Merge branch 'master' of https://github.com/aitgithub/appliedMsc