Merge branch 'master' of https://github.com/svaldivia/Van-Game-Jam

Conflicts:
	.DS_Store
	game/Assets/PhysicsMateriels/New Physic Material.physicMaterial
	game/ProjectSettings/DynamicsManager.asset
	game/ProjectSettings/EditorSettings.asset
	game/ProjectSettings/TagManager.asset