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
update
making sure my changes commit
Merge branch 'master' into damien
updating to master
Merge branch 'damien'
Merge branch 'master' of https://github.com/Dgilliams/OriginalOrigins
fixing errors, fixed the camara view for the block level, fixed the camara for swamp to see next root, and so that fixed the background
Merge branch 'EDevelopment'

Conflicts:
	OriginalOrigins.git/branches/Assets/Art/Level 6/Thumbs.db.meta
	OriginalOrigins.git/branches/Assets/Scenes/Level3.unity
	OriginalOrigins.git/branches/Assets/Sprites/Aah/Thumbs.db.meta
	OriginalOrigins.git/branches/Assets/Sprites/UltimateOoh/Thumbs.db.meta
danger sound effects (resetting master)
bug fixes, new game icon, tested a couple different ones, fixed level 6 so the mosquitos dont make the level change.