this seem may/or maynot conflict with web repo
Merge branch 'master' of github.com:Tim-HU/test1

Conflicts:
	readme.txt

I manually merged the conflicts online and on local disc. No problem now.