Initial commit
First commit
Second Commit
bætti við í global asax fyrir signalR, og signalR scriptum
Bjarnthor´s commit
Eg uppfaerdi Live Chat agentinn
Merge branch 'master' of https://github.com/GroupMayhem/Verk-2013

Conflicts:
	Game zone/Game zone/App_Data/aspnet-Game_zone-20130508154637.mdf
	Game zone/Game zone/App_Data/aspnet-Game_zone-20130508154637_log.ldf
	Game zone/Game zone/Game zone.csproj
	Game zone/Game zone/packages.config
	Game zone/packages/Owin.1.0/Owin.1.0.nupkg
failtrain í gangi
Merge branch 'master' of https://github.com/GroupMayhem/Verk-2013
Initial commit
nýtt project
Merge branch 'master' of https://github.com/GroupMayhem/Verk-2013
Game zone fjarlægt
fyrsta test
BearThor commiting
Merge branch 'master' of https://github.com/GroupMayhem/Verk-2013

Conflicts:
	Game-Zone/Game-Zone/App_Data/aspnet-Game_Zone-20130510113730.mdf
	Game-Zone/Game-Zone/App_Data/aspnet-Game_Zone-20130510113730_log.ldf
	Game-Zone/Game-Zone/Web.config
Hellað
Chat i layout.cshtml
BearThor login programming
Testmerge