Begynt å lage bruker side
Merge remote-tracking branch 'origin/master' into GuroAlpha

Conflicts:
	Admin/Admin.aspx
	Admin/Sport/AdminSport.aspx
	App_Data/aspnet-Oving4-20130219103451.mdf
	App_Data/aspnet-Oving4-20130219103451_log.ldf
slettet orig-filer
Merge remote-tracking branch 'origin/GuroAlpha'
Deleted thomastext.txt