.gitignore
obj y 11.4 player
Merge branch 'master' of https://github.com/calcus/base

Conflicts:
	ladelruso/NikolaiKlimov-starlingsamplesforflashdevelop-8bdb15f9055c/project_web/obj/projectConfig.xml
sprites demossssssss