updated gitignore
Merge branch 'mergeBranch'
changed storyline a bit
changed stage music