Trying to merge
Merge branch 'master' of github.com:JordonPhillips/MagicM8 into dochaven