commit before merging
CategoryItem and Comments finished
CategoryItemFinished
LogIn and LogOut for customer added
Bootstrap added
Merge remote-tracking branch 'origin/master'

Conflicts:
	BeerShop.suo
	BeerShop/Controllers/UsersController.cs
	BeerShop/bin/BeerShop.dll
	BeerShop/bin/BeerShop.pdb
	BeerShop/obj/Debug/BeerShop.csproj.FileListAbsolute.txt
	BeerShop/obj/Debug/BeerShop.dll
	BeerShop/obj/Debug/BeerShop.pdb
	BeerShop/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merged