tutorial
Merge remote-tracking branch 'upstream/master' into tutorial

Conflicts:
	db/schema.rb
Merge pull request #2 from shal23/tutorial

Tutorial