Beginning of AI
Merge branch 'catalin' of https://github.com/BestTEver/ourGreatAndroidProject into catalin