git Ignore
fixed git ignore
Cart controller
resolve merge conflicts
Cart Controller
Merge pull request #16 from richsalvucci/master

I have created the carts controller and the checkout model.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	log/development.log