Eso
Esborrats .DS_Store
Merge branch 'master' of https://github.com/mydocumenta/devops

Conflicts:

Vagrant/precise64/test/integration/default/serverspec/localhost/apache2_
spec.rb
	chef/chef-repo/cookbooks/apacheConfig/recipes/default.rb