ADDED ERRY THANG
missing stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	TourWebApp1/pages/About.aspx
	TourWebApp1/pages/Schedule.aspx
	TourWebApp1/pages/Schedule.aspx.cs
	TourWebApp1/pages/Schedule.aspx.designer.cs