[second commit]
Merge branch 'master' of https://github.com/brownman/ofer_asks_gitbook

Conflicts:
	README.md