Christian working branch

Merge all the changes I have made to the game in my branch to the master branch.