tjafs
Merge branch 'master' of https://github.com/gerr8ard/WebAppOblig02

Conflicts:
	BlogCentralVersion2/App_Data/Oblig2_500738_database.mdf
	BlogCentralVersion2/App_Data/Oblig2_500738_database_log.ldf