Merge pull request #15 from TheKojuEffect/master

Basic UI workflow
Merge remote-tracking branch 'devops/develop' into devops-master
Merge remote-tracking branch 'devops/master'