added weapon object to player, start enemy after through door
Merge branch 'master' of github.com:Pjchardt/PinkElephant