working on it
øhhhh shit
heeheheheheheheee
Merge remote-tracking branch 'origin/CheckBox-Branch' into watch

Conflicts:
	ProjectFood/ProjectFood/App_Data/Food.mdf
	ProjectFood/ProjectFood/App_Data/Food_log.ldf
	ProjectFood/ProjectFood/App_Data/aspnet-ProjectFood.mdf
	ProjectFood/ProjectFood/App_Data/aspnet-ProjectFood_log.ldf
	ProjectFood/ProjectFood/Scripts/sass.js
fuck
Revert "fuck"

This reverts commit 58de4c7d5abc6a1a14d453870d6130cd6f266016.
Revert "heeheheheheheheee"

This reverts commit 7e1092abcaa33c85da61df4e649af58636de94bb.
Revert "Revert "heeheheheheheheee""

This reverts commit 4985b4384b0f41fbb806f20e5b120da121ea2269.
Revert "heeheheheheheheee"

This reverts commit 7e1092abcaa33c85da61df4e649af58636de94bb.
njdsdfzhgd-klszj xg kldfhjsxzgkdfhgkjdfsz
fuck jeg hader git
fak
fuck alt
working
fuuuuuuuuuuck
close to the finish line
mere works
Merge remote-tracking branch 'origin/develop' into watch

Conflicts:
	ProjectFood/ProjectFood/App_Data/Food_log.ldf
	ProjectFood/ProjectFood/App_Data/aspnet-ProjectFood.mdf
	ProjectFood/ProjectFood/App_Data/aspnet-ProjectFood_log.ldf
	ProjectFood/ProjectFood/App_Data/aspnet-ProjectFoodzx.mdf
	ProjectFood/ProjectFood/Controllers/HomeController.cs
	ProjectFood/ProjectFood/Controllers/OfferController.cs
	ProjectFood/ProjectFood/Controllers/RecipesController.cs
	ProjectFood/ProjectFood/Controllers/ShoppingListsController.cs
	ProjectFood/ProjectFood/Controllers/UserController.cs
	ProjectFood/ProjectFood/Migrations/201411221108449_Initial.Designer.cs
	ProjectFood/ProjectFood/Migrations/201411241247502_Initialderpaaa.Designer.cs
	ProjectFood/ProjectFood/Migrations/201411241247502_Initialderpaaa.resx
	ProjectFood/ProjectFood/Migrations/201411251222441_Initial.Designer.cs
	ProjectFood/ProjectFood/ProjectFood.csproj
	ProjectFood/ProjectFood/Scripts/sass.js
	ProjectFood/ProjectFood/Views/User/EditStores.cshtml
fucking fix jeres db lort... :rage4: :shipit: :dog2: :shit:
it works and UI fixesss