[Feature-1]
[Feature-1]
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
[Feature-1]
dev
Merge branch 'Feature-1' of https://github.com/trungnv84/gitfollow into 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
â
aa
as
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
Merge pull request #1 from trungnv84/Feature-1

Feature 1