chromium
Merge branch 'master' of github.com:christofdamian/puppet-modules

Conflicts:
	modules/desktop/manifests/init.pp