Merge branch 'master' into belongs_to

Conflicts:
	lib/learn_rails/associations.rb