from wei
from wei
Merge branch 'master' of https://github.com/jdhuns2/cs499

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-Editor.pidb
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-CSharp.pidb
	Assets/James'Workspace.unity
	Assets/Pixelplacement.meta
	Assets/Pixelplacement/iTweenPath.meta
	Assets/Pixelplacement/iTweenPath/Editor.meta
	Assets/Pixelplacement/iTweenPath/iTweenPath.cs.meta
	Assets/Scripts/Player.cs
	Assets/Scripts/RPathGen.cs.meta
	ProjectSettings/QualitySettings.asset
	ProjectSettings/TagManager.asset
	cs499-csharp.sln
	cs499.sln
	cs499.userprefs