Merge branch 'welcome_text'

Conflicts: - resolved
first_file