getting AmazonS3 changes
getting latest changes
getting latest changes
getting latest changes
add app confih
Merge branch 'master' of https://github.com/alankalter/TruePhoto into juan

Conflicts:
	TruePhoto/TruePhoto/bin/TruePhoto.dll
	TruePhoto/TruePhoto/bin/TruePhoto.pdb
	TruePhoto/TruePhoto/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	TruePhoto/TruePhoto/obj/Debug/TruePhoto.csproj.FileListAbsolute.txt
	TruePhoto/TruePhoto/obj/Debug/TruePhoto.dll
	TruePhoto/TruePhoto/obj/Debug/TruePhoto.pdb
update gitignore
extraneous commit
merge
add signalR nuget package
Getting Chris' latest changes
Pushing rebuildable solution
my changes
new commit
commit
merge issues
resolve conflict
upload page
upload page
upload page