test
Merge branch 'dev' of https://github.com/riedd2/webprogramming into dev
Merge branch 'dev' of https://github.com/riedd2/webprogramming into dev
added cart
Merge branch 'dev' of https://github.com/riedd2/webprogramming into dev

Conflicts:
	ch.bfh.bti7054.w2014.p.pc-hammer/Controller/LoginController.php
	ch.bfh.bti7054.w2014.p.pc-hammer/index.php
	ch.bfh.bti7054.w2014.p.pc-hammer/view/catalog.php
Merge branch 'dev' of https://github.com/riedd2/webprogramming into dev
cart stuff