Merge branch 'master' of https://github.com/empT3/logiCanvas