Addin Gemfile.lock to gitignore
Setting version 1.3.3
Rolling back to rubyzip 0.9.9
Merge branch 'develop'