Merge branch 'master' of D:\Students with conflicts.
Commit by Nik