Update chapter.md
Proposed edits to Version Control With Git
Merge branch 'master' of github.com:openframeworks/ofBook
Merge branch 'master' of github.com:brannondorsey/ofBook

Conflicts:
	02_cplusplus_basics/chapter.md
Merge branch 'master' of github.com:openframeworks/ofBook
Merge pull request #43 from brannondorsey/master

Suggested Edits for Version Control With Git