Finished tutorial 3
Merge branch 'tedtag'