Updated layouts
Merge branch 'master' of https://github.com/MeriemSelmi/Android-Hackathon
deleted settings from the menu