untracked files on (no branch): 65017ae Adding log4net binaries
index on (no branch): 65017ae Adding log4net binaries
WIP on (no branch): 65017ae Adding log4net binaries
Merge branch 'master' of https://github.com/asafkotzer/gumblr

Conflicts:
	Gumblr.v12.suo
	Gumblr/Content/themes/default/home.less
	Gumblr/Content/themes/default/shared.less
	Gumblr/Controllers/BettingController.cs
	Gumblr/Controllers/HomeController.cs
	Gumblr/Gumblr.csproj
	Gumblr/Images/Thumbs.db
	Gumblr/Models/RequestInviteModel.cs
	Gumblr/Scripts/Home/Home.js
	Gumblr/Scripts/Home/HomeViewModel.js
	Gumblr/Scripts/_references.js
	Gumblr/Scripts/jquery.tools.min.js
	Gumblr/Storage/IStorageProvider.cs
	Gumblr/Views/Home/Index.cshtml
	Gumblr/bin/Gumblr.dll
	Gumblr/bin/Gumblr.pdb
	Gumblr/obj/Debug/Gumblr.csprojResolveAssemblyReference.cache
	Gumblr/obj/Debug/Gumblr.dll
	Gumblr/obj/Debug/Gumblr.pdb
	GumblrIntegrationTests/Tools.cs
	GumblrIntegrationTests/bin/Debug/Gumblr.dll
	GumblrIntegrationTests/bin/Debug/Gumblr.pdb
	GumblrIntegrationTests/bin/Debug/GumblrIntegrationTests.dll
	GumblrIntegrationTests/bin/Debug/GumblrIntegrationTests.pdb
	GumblrIntegrationTests/bin/Debug/Microsoft.Data.OData.xml
	GumblrIntegrationTests/bin/Debug/Microsoft.Data.Services.Client.xml
	GumblrIntegrationTests/bin/Debug/System.Spatial.xml
	GumblrIntegrationTests/obj/Debug/GumblrIntegrationTests.csproj.FileListAbsolute.txt
	GumblrIntegrationTests/obj/Debug/GumblrIntegrationTests.csprojResolveAssemblyReference.cache
	GumblrIntegrationTests/obj/Debug/GumblrIntegrationTests.dll
	GumblrIntegrationTests/obj/Debug/GumblrIntegrationTests.pdb
	GumblrUnitTests/bin/Debug/Gumblr.dll
	GumblrUnitTests/bin/Debug/Gumblr.pdb
	GumblrUnitTests/bin/Debug/GumblrUnitTests.dll
	GumblrUnitTests/bin/Debug/GumblrUnitTests.pdb
	GumblrUnitTests/bin/Debug/Microsoft.Data.OData.xml
	GumblrUnitTests/bin/Debug/Microsoft.Data.Services.Client.xml
	GumblrUnitTests/bin/Debug/System.Spatial.xml
	GumblrUnitTests/obj/Debug/GumblrUnitTests.csproj.FileListAbsolute.txt
	GumblrUnitTests/obj/Debug/GumblrUnitTests.csprojResolveAssemblyReference.cache
	GumblrUnitTests/obj/Debug/GumblrUnitTests.dll
	GumblrUnitTests/obj/Debug/GumblrUnitTests.pdb