Deleting Files to see if Git will ignore them now.
SUCCESS! Git is no longer tracking Library metadata or Temp files.

Please pull the repository's master to local before continuing since
Metadata is no longer being tracked. That stuff should stay locally.
Mountain Complete.
Updating Mountain. Going to add Toon shading with Bump Map.
Added a script for a noclipping camera. Created a new shader.
cleaned up player controller code

-Chris
Added Camera death zoomout
Cleaned up player code
pushing something to fix Git Repo.
Merge branch 'master' of https://github.com/MaybeSacred/ZOI

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/PlayerController.cs
	ZOI.userprefs