Colisao nos objetos
Merge branch 'master' of https://github.com/nataliacabral/ControladorDinamico

Conflicts:
	ControladorDinamico/ControladorDinamico/EditScene.swift