Merge pull request #1 from sq0032/master

First time remote merge
add a.txt & b.txt
temp
add c.txt
Merge branch 'feature2' into develop
change content in b.txt
also change content b.txt
add d.txt
temp
Merge branch 'feature4' into develop

Conflicts:
	b.txt
test
change b
Merge branch 'test-1' into develop

Conflicts:
	b.txt
commit
change b
change b again
Merge branch 'mergeTest' into develop
Merge pull request #2 from sq0032/develop

Develop (Good Merge)
Update a.txt

The host remote wants to change something in a.txt
The developer also wants to change something in a.txt...