a
Merge branch 'master' of https://github.com/iwatowake/GGJ2014_F

# By ideguchiyuta (3) and Victor (2)
# Via ideguchiyuta (2) and Victor (1)
* 'master' of https://github.com/iwatowake/GGJ2014_F:
  Started linking animation and movement
  アイテム追加
  Character Movement and stairs
  キャラ追加
  キャラ更新

Conflicts:
	UnityProject/Assembly-CSharp-vs.csproj
	UnityProject/Assembly-CSharp.csproj
	UnityProject/Assets/Scenes/GameOver.unity.meta
	UnityProject/Assets/Scenes/InGame.unity.meta
	UnityProject/Assets/Work/Victor/Movement Test.unity.meta
	UnityProject/UnityProject-csharp.sln
	UnityProject/UnityProject.sln
	UnityProject/UnityProject.userprefs