Removing whitespace
Merge branch 'master' of github.com:clocklimited/Catfish
Fixing order and adding file validation to upload of images
Adding asset tests for width and height