Latest commit from different computer (JHS)
Merge branch 'master' of https://github.com/Harkell/devonite
Merge branch 'master' of https://github.com/Harkell/devonite