Deleted stuff
Merge branch 'feature/jmknew' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge pull request #2 from phoenixnebula/develop

Develop