Revert "11/10/14"

This reverts commit b500c451c4a070de39a607c1152588686d965be1.

Conflicts:
	Project3/Project3-csharp.sln
	Project3/Project3.sln