Updated README with latest installation instructions
Merge branch 'master' of github.com:simonkrenger/ch.bfh.bti7054.w2013.q.webshop into simon-branch
Added first class for ShopUser
Added first version of developer guide
Merge branch 'master' of github.com:simonkrenger/ch.bfh.bti7054.w2013.q.webshop into simon-branch
Merge branch 'master' of github.com:simonkrenger/ch.bfh.bti7054.w2013.q.webshop into simon-branch
Updated Brainstorming README with latest tasks
implemented shopping cart
Merge remote-tracking branch 'origin/fraenzi-branch' into simon-branch
adapted shopping cart
Merge remote-tracking branch 'origin/fraenzi-branch' into simon-branch

Conflicts:
	Webshop/webroot/header.php
Multiple changes (super change!)
- Moved init function to index.php
- Moved ShoppingCart to classes/ folder
- Renamed shoppinglist to shoppingCart
- Fixed addItem in ShoppingCart
- Blah
Merge remote-tracking branch 'origin/fraenzi-branch' into simon-branch

Conflicts:
	Webshop/doc/Brainstorming-ToDo.md
	Webshop/webroot/header.php
Fixed index.php, added shoppingCart.php (somehow got deleted)
Moved shoppingCart.php to the correct location (shame on me!)
Moved shoppingcart logic to require_ function (fixed session problem)
Moved ShopUser class, changes
Fixed site errors, moved ShoppingCart.php to ShoppingCart.class.php