修正済み resources/prefabs
cs img add
merged file
Merge branch 'master' of https://github.com/CottonValley/Unity-Gamejam

Conflicts:
	Assets/Scene/main.unity