thread joins
Merge branch 'master' of https://github.com/esiqveland/prosjektoppgave

Conflicts:
	loaddist/sender.py