Lagt till nya ljud (inte i scripts än)
Ändringar för att försöka fixa buff men buff systemet
Merge branch 'master' into johannes

Conflicts:
	Assets/Scripts/Seans PreBeta Mapp/Winstate.cs
	Assets/otherTestCol.cs
fix other testcol for johannes, obv
Merge branch 'johannes' into sean

Conflicts:
	Assets/otherTestCol.cs