Merge branch 'master' of C:\Users\Daniel\IdeaProjects\LudumDare28 with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
added wav files to res