n and b g orchilson
Merge branch 'master' of github.com:byambadorjp/tutorial into first_branch

Conflicts:
	n_and_b.txt