got it working haha
Merging new stuff
Merge branch 'master' of github.com:JohnCoogan/Maestro