CART :: Begins cart page development
CART :: Add To Cart Method
CART :: Adds Cart Counter Update method to Cart Model
CART :: Cart Model and Item Collection
CART :: Edits CartModel and adds styling.
CART :: Minor Cart Edits
Merge branch 'master' of https://github.com/miguelpelota/n48

Conflicts:
	app/models/Cart.php
CART :: Remove Functionality, Minor Fixes
CHECKOUT :: Adds Paypal Test Files
CHECKOUT :: Initial Paypal setup
CHECKOUT :: Paypal Set and Get API Calls
CHECKOUT :: Paypal set, get, and do
CHECKOUT :: Adds Success and Failure Views
CHECKOUT :: Stores Paypal Response in DB
Merge branch 'master' of https://github.com/miguelpelota/n48

Conflicts:
	app/models/Cart.php
CHECKOUT :: Completes PayPal Checkout
Merge remote-tracking branch 'upstream/master'

Conflicts:
	misc/db_dump.sql