updated from branch-2
remove empty line for testing
Merge branch 'branch-1' into dev
Merge branch 'branch-2' into dev

Conflicts:
	README.md
removed latest updates for testing purposes