add
Merge branch 'master' of https://github.com/xoid/flicr.git