Code final version
Merge branch 'master' of github.com:kits89/CVFinalProject