Initial commit.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Remove stock Rails README.
Carrierwave branch name changed.
CarrierWave will be brought in by carrierwave-activerecord.
Add my own gem.
Use a local path, not a git repo ; much faster.
Route should be singular ; store the SHA1, not the filename.
Remove Pry.
Configure for has_many.
Update Ruby, gems, view and routes.
Remove multiple files: no ArticleFilesController, views, migrations.
Implement the download, use a member route for the link.
The member route can replace the ivar hack.
Multiple file cleanup: remove the rest of ArticleFile.
Use link_to helper and display a filename.
Remove unused attributes, code, etc.; will be added back when required.