Merge branch 'master' of C:\Users\Daniel\IdeaProjects\LD31 with conflicts.
fixed git merge bug or something?