add the starter kit from Chef
add apt cookbook and update apache
add my-company
Merge remote-tracking branch 'origin/master'

Conflicts:
	.chef/knife.rb
	.gitignore
	README.md
	Vagrantfile