try this
git is terrible
Merge branch 'master' of https://github.com/glow741/NightmareManor