Merge pull request #27 from kelvinlee93/master

Update 03/04 1:32 by K (Note: Read carefully preview before megre)
Update 3/04 2:21 by C

-Update cart function.
-Fix bug
Merge pull request #2 from mrcupid12/master

Update 3/04 2:24 by C