conflict on rect
Merge branch 'test1'

Conflicts:
	demo.livecode.vcs/cards/65405F61-5062-46DA-8EC2-4748E5524DC6/C443E031-26D8-42FE-8421-5AFBF520E5CB/properties.json
conflict on rect and added a new object