test
Merge branch 'local' of https://github.com/HyroVitalyProtago/AllFighters-Codea-Project into local

Conflicts:
	.DS_Store