first commit
Merge https://github.com/jjidt/flip