Carrier has arrived
kalle
apa
Merge branch 'linder'

Conflicts:
	silence/silence.sdf
	silence/silence.suo
	silence/silence/silence.vcxproj
	silence/silence/silence.vcxproj.filters
sdfsd