On branch master
   modified:   ChangeLog
Merge branch 'master' of https://github.com/Patrickxzm/test
Conflicts:
	ChangeLog
Merge branch 'master' of https://github.com/Patrickxzm/test