Merge pull request #1 from christiansandtveit/Christian-Working-Branch

Christian working branch
Merge pull request #2 from christiansandtveit/Christian-Working-Branch

Added objects and scripts. Modified scripts aswell.
hallway update

some armor sets in the last hallway of the first level
arms

added arms
Merge pull request #4 from christiansandtveit/Erik-working-branch

hallway update
Merge pull request #5 from christiansandtveit/master

Update my branch with Erik's changes