Merge branch 'practice-branch' to master

Conflicts:
new_file.c