Merge branch 'first_lesson' of github.com:stephenlauck/chef-fundamentals-repo into first_lesson

Conflicts:
	roles/base.rb
Merge branch 'first_lesson' of github.com:stephenlauck/chef-fundamentals-repo into first_lesson