Initial commit
Merge branch 'number-guessing'
Initial commit
Merge branch 'hangman'
Initial commit
Merge branch 'hangman-classes'
Minor updates

Edited README.md.
Re-named subproject folder.
Merge branch 'misc'
Initial commit
Moved business from a controller to a service

Fixed failing test for buy_item service
Split the business logic up from the view to a controller and a view
Updated README.md
Merge branch 'misc' into lemonade-stand
Initial commit
Moved business from a controller to a service

Fixed failing test for buy_item service
Split the business logic up from the view to a controller and a view
Updated README.md
Updated code based on comments from Roger

Main updates were to Inventory and Market by using meta programming to tidy up the code.
Merge branch 'issue7/todos' into lemonade-stand

Conflicts:
	subprojects/lemonade-stand/lib/controllers/lemonade_stand.rb
	subprojects/lemonade-stand/lib/models/bank.rb
	subprojects/lemonade-stand/lib/models/climate.rb
	subprojects/lemonade-stand/lib/models/day.rb
	subprojects/lemonade-stand/lib/models/inventory.rb
	subprojects/lemonade-stand/lib/models/ledger.rb
	subprojects/lemonade-stand/lib/models/market.rb
	subprojects/lemonade-stand/lib/models/recipe.rb
	subprojects/lemonade-stand/lib/services/buy_item.rb
	subprojects/lemonade-stand/lib/services/follow_recipe.rb
	subprojects/lemonade-stand/lib/services/sell_item.rb
	subprojects/lemonade-stand/lib/services/simulate_day.rb
	subprojects/lemonade-stand/lib/views/game.rb
	subprojects/lemonade-stand/spec/controllers/lemonade_stand_spec.rb
	subprojects/lemonade-stand/spec/models/climate_spec.rb
	subprojects/lemonade-stand/spec/models/day_spec.rb
	subprojects/lemonade-stand/spec/models/inventory_spec.rb
	subprojects/lemonade-stand/spec/models/ledger_spec.rb
	subprojects/lemonade-stand/spec/models/market_spec.rb
	subprojects/lemonade-stand/spec/services/buy_item_spec.rb
	subprojects/lemonade-stand/spec/services/follow_recipe_spec.rb
	subprojects/lemonade-stand/spec/services/sell_item_spec.rb
	subprojects/lemonade-stand/spec/services/simulate_day_spec.rb
Merge branch 'lemonade-stand' of github.com:hjwylde/learning-ruby into lemonade-stand

Conflicts:
	subprojects/lemonade-stand/lib/controllers/lemonade_stand.rb
	subprojects/lemonade-stand/lib/models/bank.rb
	subprojects/lemonade-stand/lib/models/climate.rb
	subprojects/lemonade-stand/lib/models/day.rb
	subprojects/lemonade-stand/lib/models/inventory.rb
	subprojects/lemonade-stand/lib/models/ledger.rb
	subprojects/lemonade-stand/lib/models/market.rb
	subprojects/lemonade-stand/lib/models/recipe.rb
	subprojects/lemonade-stand/lib/services/buy_item.rb
	subprojects/lemonade-stand/lib/services/follow_recipe.rb
	subprojects/lemonade-stand/lib/services/sell_item.rb
	subprojects/lemonade-stand/lib/services/simulate_day.rb
	subprojects/lemonade-stand/lib/views/game.rb
	subprojects/lemonade-stand/spec/controllers/lemonade_stand_spec.rb
	subprojects/lemonade-stand/spec/models/climate_spec.rb
	subprojects/lemonade-stand/spec/models/day_spec.rb
	subprojects/lemonade-stand/spec/models/inventory_spec.rb
	subprojects/lemonade-stand/spec/models/ledger_spec.rb
	subprojects/lemonade-stand/spec/models/market_spec.rb
	subprojects/lemonade-stand/spec/services/buy_item_spec.rb
	subprojects/lemonade-stand/spec/services/follow_recipe_spec.rb
	subprojects/lemonade-stand/spec/services/sell_item_spec.rb
	subprojects/lemonade-stand/spec/services/simulate_day_spec.rb