w
w
Merge branch 'master' of http://github.com/timlee/GitProject

Conflicts:
	README.md