hello xianhui
Merge branch 'master' of https://github.com/fitstats/workflowtest into HelloXianHui

Conflicts:
	client/index.html
Merge pull request #3 from celineotter/HelloXianHui

merge conflict resolve  from xianh
Add 'hello from andrew' message to readme