Changes to be committed:
	modified:   puppet/manifests/base.pp
Merge branch 'master' of github.com:joetjen/vagrant-base

Conflicts:
	puppet/manifests/base.pp

 On branch master
 All conflicts fixed but you are still merging.