Return random photos if we don't have enough new ones
Merge branch 'master' of github.com:jhalcrow/floto

Merge frontend changes