initial commit
Merge https://github.com/rcrozon/FartFish