Merge remote-tracking branch 'origin/master'

Conflicts:
	App_Data/Database.mdf
	App_Data/Database_log.ldf
	App_Data/Web_Dev_Coursework.mdf
	App_Data/Web_Dev_Coursework_log.ldf

	App_Data/aspnet-Web_Dev_Coursework-7aff3008-d3e3-4dad-b0ae-4e56024b2663.mdf

	App_Data/aspnet-Web_Dev_Coursework-7aff3008-d3e3-4dad-b0ae-4e56024b2663_log.ldf