laptop
Merge remote-tracking branch 'hosts/master'

Conflicts:
	hosts

merge to the laptop