new ruby version, add log to gitignore
Merge branch 'master' of https://github.com/shopmaker-com/html5-upload