MP5 initial
Merge branch 'master' of https://github.com/atinr/CSCE-613