second touch
Merge branch 'master' of https://github.com/benmliang/conflict_practise

Conflicts:
	readme.txt