comments; Makefile
Merge branch 'master' of https://github.com/matsim-org/book
Merge branch 'master' of https://github.com/matsim-org/book
making things a lot more colorful :-).  Replacing \verb by \lstinline (uses same font as listings)
conflict resolution (moving some of the \verb back)