Merge pull request #2 from alankalter/juan

Juan
Pushing Enum changes and MVC controller additions
Sending in Git ignore
c
c
Delete TruePhoto.v12.suo

removing nightmare file
Merge branch 'master' into juan

Conflicts:
	TruePhoto/TruePhoto.v12.suo
	TruePhoto/TruePhoto/TruePhoto.csproj
	TruePhoto/TruePhoto/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
bye
Merge branch 'master' into juan