local changes...
remove .pyc file. Not necessary to have in git-repos
Merge branch 'master' of https://github.com/lrhgit/tkt4140

Conflicts:
	allfiles/Utviklingsprosjekt/kap1/eks1.2/CDkule.py