Initial commit of domain objects
Updated commit of domain objects
Added basic ingredient controller / spec
Added basic sandwich controller
Updated commit of domain objects again
Merge branch 'master' into domain-classes

Conflicts:
	puppet/modules/concat/CHANGELOG
	puppet/modules/concat/Modulefile
	puppet/modules/concat/README.markdown
	puppet/modules/concat/Rakefile
	puppet/modules/concat/files/concatfragments.sh
	puppet/modules/concat/lib/facter/concat_basedir.rb
	puppet/modules/concat/manifests/fragment.pp
	puppet/modules/concat/manifests/init.pp
	puppet/modules/concat/manifests/setup.pp
	puppet/modules/concat/metadata.json
	puppet/modules/concat/spec/defines/init_spec.rb
Merge pull request #4 from Spantree/domain-classes

Domain classes