* test foo
Merge pull request #4 from jayzeng/testBranch

test
Merge branch 'master' of github.com:jayzeng/testRepo into oops

Conflicts:
	foo