Merge branch 'master' into develop
just a test(getting to understand the scripts)
Merge remote-tracking branch 'origin/master' into develop
Merge branch 'develop' of https://github.com/Dgilliams/OriginalOrigins into develop
Merge branch 'master' of https://github.com/Dgilliams/OriginalOrigins into develop
adjusted audio
Merge branch 'develop' of https://github.com/Dgilliams/OriginalOrigins into develop
Merge remote-tracking branch 'origin/master' into develop
more fixes
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	OriginalOrigins.git/branches/ProjectSettings/ProjectSettings.asset
danger sound effects (resetting master)
Merge branch 'develop' of https://github.com/Dgilliams/OriginalOrigins into develop

Conflicts:
	OriginalOrigins.git/branches/Assets/Scripts/SoundManagerScript.cs
	OriginalOrigins.git/branches/ProjectSettings/ProjectSettings.asset
Merge remote-tracking branch 'origin/master' into develop