[Feature-1]
add function b; edit function a
Merge branch 'Feature-1' of https://github.com/trungnv84/gitfollow into Feature-1

Conflicts:
	default.txt
Merge branch 'Feature-1' of https://github.com/trungnv84/gitfollow into Feature-1

Conflicts:
	default.txt