size
merged in resizing
size
Merge branch 'master' of github.com:adamreis/spotad-hackathon into gh-pages