upgrade rvm
adding missed logo.png
add quantity to Cart
Merge branch 'master' of https://github.com/jguitar/depot-four

Conflicts:
	.ruby-version