added resize javascript
fix whitespace conflict
Merge pull request #12 from th7/photo_upload

Photo upload