File Uploading
Merge branch 'master' of github.com:andrewek/rails_intro

Conflicts:
	readme.md