story is now integrated into the game
fixed some more stuff with the story
updated gitignore
Merge branch 'mergeBranch'