Added more to the tutorial.
Fixed merge conflict.