Merge pull request #17 from christiansandtveit/master

Merge Erik's changes into my branch
Merge pull request #19 from christiansandtveit/master

Sync my working branch with master
Added comments in scripts

I added comments on the scripts I have written, and also some comments
on some of the scripts I have modified to make my changes work ingame.
Merge pull request #20 from christiansandtveit/Christian-Working-Branch

Christian working branch