Flippy added on home
Merge branch 'master' of https://github.com/whatsup-project/whatsup