befor pull
Merge branch 'dev' of https://github.com/Itay289/Kick-It into dev
added comments
fix conflict