Merge branch 'master' of https://github.com/Benom84/Noahs-arc-side

Conflicts:
	Assets/Prefabs/Enemies/EnemyChicken.prefab
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjectSettings/TagManager.asset
Merge branch 'master' of https://github.com/Benom84/Noahs-arc-side