Added Office
Merge branch 'master' of https://github.com/alastairpat/myboxen

Conflicts:
	manifests/site.pp