local edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
add foo.lib
updated README foo lib
Merge pull request #1 from kcgthb/feature-x

Add foo.lib for x feature