fix  errors
fixd more
Merge branch 'master' of github.com:beanu/IFT-project