lk
kjghiujsd
dvb
Merge branch 'master' of https://github.com/minoru-kun/tp
Merge branch 'master' of https://github.com/minoru-kun/tp

Conflicts:
	WindowsGame2.suo
	WindowsGame2/WindowsGame2/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	WindowsGame2/WindowsGame2Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
h
Merge branch 'master' of https://github.com/minoru-kun/tp

Conflicts:
	WindowsGame2.suo
	WindowsGame2/WindowsGame2/Plate.cs
	WindowsGame2/WindowsGame2/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	WindowsGame2/WindowsGame2Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
fixed error load content (was mentioned twice)
Merge branch 'master' of https://github.com/minoru-kun/tp
c