.
Merge branch 'master' of https://github.com/valbeat/haewataru

Conflicts:
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	haewataru-csharp.sln
	haewataru.sln
	haewataru.userprefs
test
Merge branch 'master' of https://github.com/valbeat/haewataru

Conflicts:
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	haewataru-csharp.sln
	haewataru.sln
	haewataru.userprefs
Unityちゃん
Merge branch 'master' of https://github.com/valbeat/haewataru

Conflicts:
t 	Assets/Script/GameController/PlayerStatus.cs
	haewataru.userprefs