this shouldn't be here
this shouldn't be here
shouldn't be here
shouldn't be here
shouldn't be here
shouldn't be here
shouldn't be here
shouldn't be here
shouldn't be here
shouldn't be here
shouldn't be here
.gitignore is now working
ran some ignore commands
saturday update
got manipulation with selection working
some fine manipulation
about to merge
Merge branch 'branch-d'cameron' into devBranch

Conflicts:
	Puzzle/Assembly-CSharp-Editor-vs.csproj
	Puzzle/Assembly-CSharp-Editor.csproj
	Puzzle/Assembly-CSharp-vs.csproj
	Puzzle/Assembly-CSharp.csproj
	Puzzle/Assembly-UnityScript-Editor-firstpass-vs.unityproj
	Puzzle/Assembly-UnityScript-Editor-firstpass.unityproj
	Puzzle/Puzzle-csharp.sln
	Puzzle/Puzzle.sln
	Puzzle/Puzzle.userprefs
deleted some stuff i guess
Merge branch 'devBranch' of https://github.com/g8231226702/3D_Final_Unity into devBranch