fixed merge conflicts
Merge branch 'master' of https://github.com/Zephyr6/CyberpunkJam
Added missing script