Updated GitIgnore with Assets/-tk2d*
deleted old platform basics
Merge branch 'master' of https://github.com/huminaboz/SalPal

Conflicts:
	.gitignore
	PlatformBasics/Assets/-tk2d.asset

PlatformBasics/Assets/TK2DROOT/tk2dTileMap_demo/Demo1/TilemapdemoSpriteC
ollection Data/TilemapdemoSpriteCollection.prefab

PlatformBasics/Assets/TK2DROOT/tk2dTileMap_demo/Demo1/TilemapdemoSpriteC
ollection Data/atlas0 material.mat

PlatformBasics/Assets/TK2DROOT/tk2dTileMap_demo/Demo1/TilemapdemoSpriteC
ollection Data/atlas0.png

PlatformBasics/Assets/TK2DROOT/tk2dTileMap_demo/Demo1/TilemapdemoSpriteC
ollection.prefab
	PlatformBasics/Assets/TK2DROOT/tk2dUI_demo/Assets/Dark/UIDemoDark
Data/UIDemoDark.prefab
	PlatformBasics/Assets/TK2DROOT/tk2dUI_demo/Assets/Dark/UIDemoDark
Data/UIDemoDarkNunito16 data.prefab
	PlatformBasics/Assets/TK2DROOT/tk2dUI_demo/Assets/Dark/UIDemoDark
Data/UIDemoDarkNunito24 data.prefab
	PlatformBasics/Assets/TK2DROOT/tk2dUI_demo/Assets/Dark/UIDemoDark
Data/UIDemoDarkNunito32 data.prefab
	PlatformBasics/Assets/TK2DROOT/tk2dUI_demo/Assets/Dark/UIDemoDark
Data/atlas0 material.mat
	PlatformBasics/Assets/TK2DROOT/tk2dUI_demo/Assets/Dark/UIDemoDark
Data/atlas0.png

PlatformBasics/Assets/TK2DROOT/tk2dUI_demo/Assets/Dark/UIDemoDark.prefab

PlatformBasics/Assets/TK2DROOT/tk2dUI_demo/Assets/Font/OldSansBlack/UIDe
moOldSansBlack data.prefab

PlatformBasics/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/UIDem
oSpriteCollection Data/UIDemoSpriteCollection.prefab

PlatformBasics/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/UIDem
oSpriteCollection Data/atlas0 material.mat

PlatformBasics/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/UIDem
oSpriteCollection Data/atlas0.png

PlatformBasics/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/UIDem
oSpriteCollection.prefab

PlatformBasics/Assets/TK2DROOT/tk2d_demo/democameradata/DemoCameraSprite
Collection.prefab

PlatformBasics/Assets/TK2DROOT/tk2d_demo/democameradata/DemoCameraSprite
Collection_Data/atlas0.png

PlatformBasics/Assets/TK2DROOT/tk2d_demo/democameradata/DemoCameraSprite
Collection_Data/atlas0_material.mat

PlatformBasics/Assets/TK2DROOT/tk2d_demo/democameradata/DemoCameraSprite
Collection_Data/data.prefab

PlatformBasics/Assets/TK2DROOT/tk2d_demo/demospritecollection/DemoSprite
Collection.prefab

PlatformBasics/Assets/TK2DROOT/tk2d_demo/demospritecollection/SpriteColl
ection_Data/atlas.png

PlatformBasics/Assets/TK2DROOT/tk2d_demo/demospritecollection/SpriteColl
ection_Data/atlas0_material.mat

PlatformBasics/Assets/TK2DROOT/tk2d_demo/demospritecollection/SpriteColl
ection_Data/data.prefab

PlatformBasics/Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas.prefa
b

PlatformBasics/Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas_Data/
atlas0.png

PlatformBasics/Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas_Data/
atlas0_material.mat

PlatformBasics/Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas_Data/
atlas1.png

PlatformBasics/Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas_Data/
atlas1_material.mat

PlatformBasics/Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas_Data/
atlas2.png

PlatformBasics/Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas_Data/
atlas2_material.mat

PlatformBasics/Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas_Data/
atlas3.png

PlatformBasics/Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas_Data/
atlas3_material.mat

PlatformBasics/Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas_Data/
data.prefab

PlatformBasics/Assets/TK2DROOT/tk2d_demo/spider/DemoSpiderSpriteCollecti
on.prefab
	PlatformBasics/Assets/TK2DROOT/tk2d_demo/spider/Spider_Data/atlas0.png

PlatformBasics/Assets/TK2DROOT/tk2d_demo/spider/Spider_Data/atlas0_mater
ial.mat
	PlatformBasics/Assets/TK2DROOT/tk2d_demo/spider/Spider_Data/data.prefab