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
Added vote domain class, ability to submit sandwiches
Merge pull request #5 from Spantree/voting

Added vote domain class, ability to submit sandwiches
Checkpoint
Moving sandwich controller into appropriate folder
Initial design of sandwich app
Merge pull request #6 from Spantree/feature/sandwich-builder

Feature/sandwich builder
Updated sandwich controller
Added Ingredient Controller test
Merge pull request #7 from Spantree/domain-classes

Added Ingredient Controller test
Adding controller that is activated by the /sandwich route
Adding controller that is activated by the /sandwich route
Merge branch 'feature/sandwich-builder' of github.com:Spantree/breadless into feature/sandwich-builder
Merge pull request #8 from Spantree/feature/sandwich-builder

Feature/sandwich builder