cart & user registration & sessions & MUUUUUUCH HARDCODE
Merge remote-tracking branch 'origin/master'