initial
Merge branch 'master' of https://github.com/Derek-Jones/MP-and-Friends