Garden with collisions
Merge branch 'master' of github.com:miguelSantirso/10_seconds_to_live

Conflicts:
	assets/layout_10s.fla
	ten_seconds_as/lib/sort_test.swc