edit 2 lines
Merge branch 'master' of https://github.com/dwchiang/testwithjustine

Conflicts:
	aaa.txt