Added minglish_lesson.py solution
Fixed conflicts