Added some skeleton structure for a Puppet repo. Could be useful to somebody
Fixed conflicts