initial commit
Merge branch 'master' of github.com:alex-laties/MMFE