Remove resize option
Fix merge conflicts
Update .gitignore
Merge pull request #183 from krazemon/resize

Remove resize option