I don't know what this is
Merge branch 'master' of https://github.com/cookie966507/LMC4730

Conflicts:
	Assets/Art/Textures/OrigamiBoatBackground.jpg.meta