Revert "Merge branch 'master' of https://github.com/FireKraken/green-screen-team"

This reverts commit 65aa1fb7216421ce401014c62e97a2eebce1913c, reversing
changes made to ae24912a8f4b7894845e90716fe3f2af298dc34b.