Fixed link
Merge remote-tracking branch 'origin'

Conflicts:
	rails/project_ar_basics.md