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

Conflicts:
	default.txt