edited usercontroller
Merge branch 'master' of https://github.com/ericman93/BiteMe

Conflicts:
	Foddies/Foddies.csproj
	Foddies/bin/Foddies.dll
	Foddies/bin/Foddies.pdb
	Foddies/obj/Debug/Foddies.csproj.FileListAbsolute.txt
	Foddies/obj/Debug/Foddies.csprojResolveAssemblyReference.cache
	Foddies/obj/Debug/Foddies.dll
	Foddies/obj/Debug/Foddies.pdb
	new file:   Foddies/Foddies.csproj
	modified:   Foddies/Foddies.csproj
	modified:   Foddies/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	modified:   Foddies/Foddies.csproj
Revert "edited usercontroller"

This reverts commit 6e3c913f2b87adc0e73138bc00525194f11c7e97.

Conflicts:
	Foddies/Foddies.csproj
	Foddies/bin/Foddies.dll
	Foddies/bin/Foddies.pdb
	Foddies/obj/Debug/Foddies.csproj.FileListAbsolute.txt
	Foddies/obj/Debug/Foddies.csprojResolveAssemblyReference.cache
	Foddies/obj/Debug/Foddies.dll
	Foddies/obj/Debug/Foddies.pdb
Revert "edited usercontroller"

This reverts commit 7e3c913f2b87adc0e73138bc00525194f11c7e97.

Conflicts:
	Foddies/Foddies.csproj
tortoise check
added user
Merge branch 'master' of https://github.com/ericman93/BiteMe

Conflicts:
	Foddies/bin/Foddies.dll
	Foddies/bin/Foddies.pdb
	Foddies/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Foddies/obj/Debug/Foddies.dll
	Foddies/obj/Debug/Foddies.pdb