Added test assets
Merge branch 'resize'
Merge branch 'master' of https://github.com/Turistforeningen/node-s3-uploader
Merge branch 'master' of https://github.com/Turistforeningen/node-s3-uploader
Merge branch 'master' of https://github.com/Turistforeningen/node-s3-uploader
Resizing
fixed merge conflicts