added information about working with flavors
Merge branch 'master' of github.com:gc3-uzh-ch/gridka-school

Conflicts:
	tutorial/tutorial.rst
fix merge