set some config settings
Gemfile.lock updated
spike and attempt fixes
fixed merge conflicts
Merge pull request #10 from cdcueva/file-uploading

File uploading
fix merge master conflicts