updates for integration
Merge pull request #68 from rayguard/master

File Upload Works
upgrade gems
Merge branch 'master' into development
quick fix
check
Update Gemfile
Test