Your commit message
msg
letsrate
Merge branch 'master' of https://github.com/Arkanine/SelfTeacher

Conflicts:
	app/views/carts/_cart.html.erb
	config/routes.rb
	db/schema.rb