Merge branch 'master' of https://github.com/jgonzalezEmphasys/PeopleTexts

Conflicts:
	TextThePeople/TextThePeople.v11.suo
	TextThePeople/TextThePeople/TextThePeople.csproj
	TextThePeople/TextThePeople/bin/TextThePeople.dll
	TextThePeople/TextThePeople/bin/TextThePeople.pdb
	TextThePeople/TextThePeople/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	TextThePeople/TextThePeople/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	TextThePeople/TextThePeople/obj/Debug/TextThePeople.csproj.FileListAbsolute.txt
	TextThePeople/TextThePeople/obj/Debug/TextThePeople.csprojResolveAssemblyReference.cache
	TextThePeople/TextThePeople/obj/Debug/TextThePeople.dll
	TextThePeople/TextThePeople/obj/Debug/TextThePeople.pdb
Merge branch 'master' of https://github.com/jgonzalezEmphasys/PeopleTexts