5
Merge branch 'master' of github.com:kennyhack/myproject

Conflicts:
	a.txt