Final Commit After Launch
Merge branch 'master' of https://github.com/vedurocks/flicking