C2 -2
Merge branch 'master' of https://github.com/marklipcseylsyh/excercise2

Conflicts:
	file1.txt