Merge pull request #1 from TakemuraKotaro/develop

Develop
Merge pull request #2 from TakemuraKotaro/develop

Develop
prefab in player
Merge pull request #3 from TakemuraKotaro/master

Develop
Merge branch 'develop' into feature/course_collider
Merge branch 'develop' of https://github.com/TakemuraKotaro/141017_MarioCart2D into develop

Conflicts:
	Assets/Scripts/gameItems/Player.cs
commit
joystick追加, playerからカメラを独立させる修正、回転をCartからPlayerに変更
joystickタグによるエラー修正
map
途中コミット
カーブ追加
cart_motion 一旦コミット
Merge branch 'feature/cart_motion' into develop
sample tile
Merge branch 'develop' into feature/course_collider

Conflicts:
	Assets/Scripts/gameItems/Cart.cs
	Assets/Scripts/gameItems/Player.cs
途中経過
joystick
haha
Merge branch 'develop' into feature/course_collider

Conflicts:
	Assets/Resources/Maps/DesertTile.png.meta
	Assets/Resources/Maps/MapTile.png.meta
	Assets/Resources/Maps/black.png.meta
	Assets/Resources/Sprites/Background/map_full_rite.png
	Assets/Resources/Sprites/Background/map_full_rite.png.meta
	Assets/Resources/Sprites/Background/stage_1.png
	Assets/Resources/Sprites/Background/stage_1.png.meta
	Assets/Resources/Sprites/Cart/Cart_2.png
	Assets/Resources/Sprites/Cart/Cart_2.png.meta
	Assets/Resources/Sprites/Cart_2.png.meta
	Assets/Resources/Sprites/map_full_rite.png.meta
	Assets/Resources/Sprites/stage_1.png.meta
	Assets/Scripts/gameItems/Cart.cs
	Assets/Scripts/gameItems/Player.cs