Update
Test

Conflicts:
	src/objects/Character.as