modified b.txt
Merge branch 'master' of https://github.com/jzuken/test

Conflicts:
	b/b.txt