Update 3/04 2:24 by C

-Merge project from K .
-Update cart function