working on order
Merge branch 'master' of https://github.com/SoftwareProject2013/BeerShop

Conflicts:
	BeerShop.suo
	BeerShop/bin/BeerShop.dll
	BeerShop/bin/BeerShop.pdb
	BeerShop/obj/Debug/BeerShop.dll
	BeerShop/obj/Debug/BeerShop.pdb
start design
shit
Merge branch 'master' of https://github.com/SoftwareProject2013/BeerShop

Conflicts:
	BeerShop.suo
	BeerShop/bin/BeerShop.dll
	BeerShop/bin/BeerShop.pdb
	BeerShop/obj/Debug/BeerShop.dll
	BeerShop/obj/Debug/BeerShop.pdb
Merge branch 'master' of https://github.com/SoftwareProject2013/BeerShop

Conflicts:
	BeerShop.suo
	BeerShop/bin/BeerShop.dll
	BeerShop/bin/BeerShop.pdb
	BeerShop/obj/Debug/BeerShop.dll
	BeerShop/obj/Debug/BeerShop.pdb
	BeerShop/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	BeerShop/obj/Debug/ResolveAssemblyReference.cache
friday meeting finished