Changed Bill's file
Resolved conflict
Merge branch 'master' of https://github.com/studentsys-msu/GitTraining
Merge branch 'master' of https://github.com/studentsys-msu/GitTraining