Novice shell lesson is now written in terms of Nelle instead of Vlad.
added floor division to function that is python 2.x and 3.x compatible
incorporating suggestions by @PBarmby and rerunning entire notebook so cells are numbered better.
Expanding the section on StringIO, will explain function next
novice/git: avoid saying that git uses diff

It does not.
Merge pull request #585 from keszybz/git-diff-fix

novice/git: avoid saying that git uses diff
add .PHONY targets to make

see https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html for an explanation why this is useful
Merge pull request #508 from drlabratory/starry-night-lesson

Starry night using ipythonblocks
Merge pull request #535 from gvwilson/rewriting-shell-lesson-using-nelle

Rewriting novice shell lesson so that everything refers to Nelle instead of Vlad.
Merge pull request #610 from ivanov/phony-targets

add .PHONY targets to make
Merge branch 'master' of https://github.com/swcarpentry/bc

Conflicts:
	novice/python/starry-night.ipynb

trying to get local fork in sync