Merge branch 'master' of https://github.com/CNM190/Nightmare

Conflicts:
	scenes/shots.yaml

Updated shots.yaml for New_Hallway1