merging issues
more cleaning
Merge remote-tracking branch 'origin/AI-Class'