a
Merge branch 'master' of https://github.com/tosenzzz/Proj1

Conflicts:
	d.txt