edited on clas
Merge branch 'master' of github.com:lrhgit/tkt4140

Conflicts:
	Kap3/avsnitt321/ribbe.py