Added justinseubert.txt file.
Version increase
added jamescobb.txt
added file jamescobb.txt
fixed my misstype
Merge branch 'jamescobb_dev' of https://github.com/mattjbarlow/apache-site into jamescobb_dev

Conflicts:
	metadata.rb
	recipes/default.rb
fixed the manual merge messup
fixed things
Changed version bump to be in line behind two other PR
Merge branch 'master' of https://github.com/mattjbarlow/apache-site into jseubert_dev

Conflicts:
	metadata.rb
	recipes/default.rb
Fixed manual merge
Fixed manual merge
add file '/root/jacobdearing.txt'
Merge pull request #25 from mattjbarlow/jamescobb_dev

Jamescobb dev
Fix version
Fix version
Merge conflicts
Merge branch 'dearing-jacobdearing_dev' into staging
Merge pull request #29 from mattjbarlow/master

migrate staging to prod
Merge pull request #30 from mattjbarlow/staging

migrate staging to prod - redux