fixes typo in composite photo
use smaller image for composite
Merge branch 'master' of heroku.com:yomo-test
fb
fb1
fb2
fb3
fb4
fb4
fb5
fb6
fb7
fb8
fb9
fb10
fb11
fb12
fb13
fb14
fb15