My non-rebased commit
Merge branch 'master' of https://github.com/AshRagheb/demo_app