Work on nth child-not functional
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile
	config/database.yml
slight modification to config/database.yml
Merge remote-tracking branch 'upstream/master'
Format cart and pages
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/items_controller.rb
Merge remote-tracking branch 'upstream/master'
Format store and order form
Merge changes
Merge pull request #8 from susieye19/master

Format cart and pages with merge