local update
Merge branch 'master' of github.com:twalker/eggshell

Conflicts:
	readme.md