latest updates from April 24 - tutorial and graphic
fixing merge conflict
Merge pull request #1216 from tysonn/mergeconflictfixin

Mergeconflictfixin