modified:   bin-debug/ExtractSprites-app.xml
	modified:   bin-debug/ExtractSprites.swf
	modified:   src/ExtractSprites.as
	modified:   src/sprite_pckg/SpriteExporter.as
	modified:   src/spritesheet_pckg/SpriteSheetProvider.as
	.DS_Store
	ExtractSprites.iml
	bin-debug/.DS_Store
	bin-debug/ExtractSprites-descriptor.xml
	bin-debug/ExtractSprites.app/
Merge branch 'master' of https://github.com/NenadBojkovski/ExtractSprites

Conflicts:
	bin-debug/ExtractSprites.swf
	src/ExtractSprites.as

	modified:   src/ExtractSprites.as
	.DS_Store
	ExtractSprites.iml
	bin-debug/.DS_Store
	bin-debug/ExtractSprites-descriptor.xml
	bin-debug/ExtractSprites.app/