Commit before pulling.
Fix merge conflict.
Add zip-zip to gemfile.
Merge pull request #38 from cassiemoy/master

Add zip-zip.