updated snap path in the setup Makefile
Merge remote branch 'upstream/master'
added tutorial text for TUNgraph and TNGraph
Fixed merge conflicts