conflict check
add fitcha
Merge branch 'develop' of https://github.com/dimonmykytenko/myPortfolio into feature/big_local
Merge branch 'develop' of https://github.com/dimonmykytenko/myPortfolio into develop
Merge branch 'feature/big_local' into develop