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