animation och skit
Merge branch 'master' into sean
animatiotn
Merge branch 'sean'

Conflicts:
	Assets/Meshes/Character/Character1/CharacterController/Jessica_Controller.controller
	Assets/Meshes/Character/Character1/CharacterController/Leif_Controller.controller
	Assets/Meshes/Character/Character1/CharacterController/Sarah_Controller.controller
Merge branch 'johannes'