ok
Merge branch 'Feature-1'

Conflicts:
	default.txt
Merge branch 'master' of https://github.com/trungnv84/gitfollow