more update

jfksoerltnykjdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	IslandGame/Assets/PlayerController.controller