Better late than never ... Helmut
Merge pull request #84 from mattjbarlow/helmut_dev

Helmut dev MERGED
Herb Jackson Devops Challenge #3
Merge pull request #86 from mattjbarlow/herbjackson_dev

Herbjackson dev
Merge pull request #87 from mattjbarlow/herbjackson_dev

Herb Jackson Devops Challenge #3
Herb Jackson Devops Challenge #3 (typo fix)
Herb Jackson Devops Challenge #3 (typo fix)
James initial apache-site add. Name and metadata to .39
Merge pull request #88 from mattjbarlow/herbjackson_dev

Herbjackson dev
updating version
Merge branch 'staging' of https://github.com/mattjbarlow/apache-site into jamesc_dev

had to update version has herb merged his branch in while I had it updated

Conflicts:
	metadata.rb
Merge pull request #89 from mattjbarlow/staging

Staging
Merge pull request #90 from mattjbarlow/jamesc_dev

Jamesc dev
Merge pull request #91 from mattjbarlow/staging

JamesC PR #3 to Master
up to 1.41 - merged seandons changes for both challenges