update
Merge branch 'master' of github.com:fabaff/ch.bfh.bti7054.w2013.p.shop
remove whitespace
remove password stuff