test
Merge branch 'master' of https://github.com/zeevmoney/JavaProject-ZL.git
Merge branch 'master' of https://github.com/zeevmoney/JavaProject-ZL.git
changed some logic in Model