ziv first merge
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