first commit
Merge branch 'master' of https://github.com/ifried01/MMD-Project-1