hello from git extension
happy sync test
Merge branch 'master' of https://github.com/bryankimartificio/firstapp

Conflicts:
	New Text Document.txt