First commit:
Merge branch 'master' of https://github.com/tinker20/flicker