edit images
Merge branch 'master' of github.com:pfarrell/bemused