tutorial 2
Merge branch 'master' of github.com:jinnee/tutorials

Conflicts:
	screenshots/tutorial_2_first_screen.png