per platform images
fixed merge conflict
I swear I really fixed the conflict this time
Merge branch 'master' of https://github.com/esjay/just-deserts
better images for everything
Merge branch 'master' of https://github.com/esjay/just-deserts