plop
Merge branch 'master' of https://github.com/MaximeBonnet/ScoringGameSkeleton

Conflicts:
	Assets/Skeleton.controller
	Assets/Skeleton_Pack/_source(chibi)/Models/Materials.meta
	Assets/Skeleton_Pack/_source(chibi)/Models/Materials/base_skeleton_angry_col.mat.meta
	Assets/Skeleton_Pack/_source(chibi)/Models/Materials/base_skeleton_col.mat.meta
	Assets/Skeleton_Pack/_source(chibi)/Models/Materials/king_sword_col.mat.meta
	Assets/Skeleton_Pack/_source(chibi)/Models/Materials/mage_skeleton_col.mat.meta
	Assets/Skeleton_Pack/_source(chibi)/Models/Materials/skel_archer_col.mat.meta
	Assets/Skeleton_Pack/_source(chibi)/Models/Materials/skeleton_king_col.mat.meta
	Assets/Skeleton_Pack/_source(chibi)/Models/Materials/skeleton_warrior_col_01.mat.meta
	Assets/Skeleton_Pack/_source(regular)/Models/Materials.meta
	Assets/Skeleton_Pack/_source(regular)/Models/Materials/base_skeleton_angry_col.mat.meta
	Assets/Skeleton_Pack/_source(regular)/Models/Materials/base_skeleton_col.mat.meta
	Assets/Skeleton_Pack/_source(regular)/Models/Materials/king_sword_col.mat.meta
	Assets/Skeleton_Pack/_source(regular)/Models/Materials/mage_skeleton_col.mat.meta
	Assets/Skeleton_Pack/_source(regular)/Models/Materials/skel_archer_col.mat.meta
	Assets/Skeleton_Pack/_source(regular)/Models/Materials/skeleton_king_col.mat.meta
	Assets/Skeleton_Pack/_source(regular)/Models/Materials/skeleton_warrior_col_01.mat.meta