up to date userprofile page/don't try to run
Update_Test1
Merge branch 'master' of https://github.com/hehahohee/CmpE-137-Final-Project

Conflicts:
	Introduction_WebApplication1/Introduction_WebApplication1.v11.suo
	Introduction_WebApplication1/Introduction_WebApplication1/Login.aspx.cs
	Introduction_WebApplication1/Introduction_WebApplication1/bin/Introduction_WebApplication1.dll
	Introduction_WebApplication1/Introduction_WebApplication1/bin/Introduction_WebApplication1.pdb
	Introduction_WebApplication1/Introduction_WebApplication1/obj/Debug/Introduction_WebApplication1.dll
	Introduction_WebApplication1/Introduction_WebApplication1/obj/Debug/Introduction_WebApplication1.pdb
updated user profile page that pulls from database. will need updated sql file.
Merge branch 'master' of https://github.com/hehahohee/CmpE-137-Final-Project

Conflicts:
	Introduction_WebApplication1/Introduction_WebApplication1/bin/Introduction_WebApplication1.dll
	Introduction_WebApplication1/Introduction_WebApplication1/bin/Introduction_WebApplication1.pdb
	Introduction_WebApplication1/Introduction_WebApplication1/obj/Debug/Introduction_WebApplication1.csprojResolveAssemblyReference.cache
	Introduction_WebApplication1/Introduction_WebApplication1/obj/Debug/Introduction_WebApplication1.dll
MOST UP TO DATE. Includes commented out lines for database connections. Pages: register/login/userprofile
My Update 12_2_2013 #1
Merge branch 'master' of https://github.com/hehahohee/CmpE-137-Final-Project

Conflicts:
	Introduction_WebApplication1/Introduction_WebApplication1.v11.suo
	Introduction_WebApplication1/Introduction_WebApplication1/ListPOIs.aspx
	Introduction_WebApplication1/Introduction_WebApplication1/ListPOIs.aspx.designer.cs
	Introduction_WebApplication1/Introduction_WebApplication1/Login.aspx.cs
	Introduction_WebApplication1/Introduction_WebApplication1/Register.aspx.cs
	Introduction_WebApplication1/Introduction_WebApplication1/bin/Introduction_WebApplication1.dll
	Introduction_WebApplication1/Introduction_WebApplication1/bin/Introduction_WebApplication1.pdb
	Introduction_WebApplication1/Introduction_WebApplication1/obj/Debug/Introduction_WebApplication1.dll
	Introduction_WebApplication1/Introduction_WebApplication1/obj/Debug/Introduction_WebApplication1.pdb
ListPOIs more or less done
Update Merge1
Merge branch 'master' of https://github.com/hehahohee/CmpE-137-Final-Project

Conflicts:
	Introduction_WebApplication1/Introduction_WebApplication1/ListPOIs.aspx
	Introduction_WebApplication1/Introduction_WebApplication1/ListPOIs.aspx.designer.cs
Updated Registration Page with the DB Fields.

Based on Talanda's Parameters the new fields should match the database.
Talanda and Tom, try to meet up today with Alex so that you can finish
your parts.
POIdetails
Fields increment properly

added my (Alex's) connection strings
Cleaned up ListPOIs.aspx
David_Commit
Merge branch 'master' of https://github.com/hehahohee/CmpE-137-Final-Project

Conflicts:
	Introduction_WebApplication1/Introduction_WebApplication1.v11.suo
	Introduction_WebApplication1/Introduction_WebApplication1/Web.config
some changes to POIdetails.aspx.cs
final POIdetails
added submit review function