cookie
Merge branch 'master' of https://github.com/MikeRavenelle/csce361project1145

Conflicts:
	csce361project1145.v12.suo
Idk
Merge remote-tracking branch 'origin/Nathan'

Conflicts:
	bin/csce361project1145.dll
	bin/csce361project1145.pdb
	csce361project1145.v12.suo
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	obj/Debug/csce361project1145.dll
	obj/Debug/csce361project1145.pdb
Styling

Edited Login.cshtml to move the twitter button to the center of the page
and added some style things to make the page visually appealing.

Edited the Content/Site.css to include styling for the homepage (login
page of the site)

Added image files to the content images folder for the Nebraska N and
the gradient background of the site.
View Map

Changed the View Map font and color to keep consistency. Also centered
text on the screen.
Added username to the top of each image
Error Checking

Do not allow delete if comment or image has already been deleted but
page has not been refreshed
Current User used for addComment() in Search
Merge remote-tracking branch 'origin/master'

Conflicts:
	App_Data/auth.mdf
	App_Data/auth_log.ldf
	csce361project1145.v12.suo
	obj/Debug/csce361project1145.csprojResolveAssemblyReference.cache
Merge remote-tracking branch 'origin/master'

Conflicts:
	App_Data/auth.mdf
	App_Data/auth_log.ldf
	Content/Site.css
	csce361project1145.v12.suo
	obj/Debug/csce361project1145.csprojResolveAssemblyReference.cache
no idea
idk
idk2
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/csce361project1145.dll
	bin/csce361project1145.pdb
	obj/Debug/csce361project1145.dll
	obj/Debug/csce361project1145.pdb
Added Images

Added images to the solution
Merge branch 'master' of https://github.com/MikeRavenelle/csce361project1145

Conflicts:
	bin/csce361project1145.dll
	bin/csce361project1145.pdb
	csce361project1145.v12.suo
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	obj/Debug/csce361project1145.dll
	obj/Debug/csce361project1145.pdb
Fixed GPS Data

FIxed GPS Data
Merge remote-tracking branch 'origin/master'

Conflicts:
	obj/Debug/Package/PackageTmp/Content/Site.css
	obj/Debug/Package/PackageTmp/Views/Account/Login.cshtml
	obj/Debug/Package/PackageTmp/Views/Home/App_Data/auth.mdf
	obj/Debug/Package/PackageTmp/Views/Home/App_Data/auth_log.ldf
	obj/Debug/Package/PackageTmp/Views/Home/Search.cshtml
	obj/Debug/Package/PackageTmp/Views/Home/Upload.cshtml
	obj/Debug/Package/PackageTmp/Views/Home/ViewMap.cshtml
	obj/Debug/Package/PackageTmp/bin/csce361project1145.dll
	obj/Debug/Package/PackageTmp/bin/csce361project1145.pdb
	obj/Debug/csce361project1145.csprojResolveAssemblyReference.cache
Fix GPS data...maybe

I KNOW NOT WHAT I AM DOING - MIKE