test
test 2
Merge branch 'Jack' in training

* Jack:
  test

Conflicts:
	first_file.txt
remove duplicated file first_files.txt
Merge branch 'master' of https://github.com/chanont-poon/git-training

* 'master' of https://github.com/chanont-poon/git-training:
  changed
  commit first change

Conflicts:
	first_file.txt