First mockup
Merge https://github.com/zmiftah/gitrepo