joshrichards.txt
Increment to .41
.
Merge branch 'staging' of https://github.com/mattjbarlow/apache-site into staging

merging
Helpful to have the corresponding action
Helpful to have the corresponding action
Merge branch 'jens_dev' of github.com:mattjbarlow/apache-site into jens_dev

Conflicts:
	recipes/default.rb
adding myself to the list!
default.rb fix
fixes for rubocop
Merge pull request #101 from mattjbarlow/jwarden_dev

Jwarden dev
appended my name to index.html
Merge pull request #99 from mattjbarlow/jens_dev

Helpful to have the corresponding action
Merge pull request #102 from mattjbarlow/racker-bobg_dev

appended my name to index.html
adding joshrichards.txt
Merge pull request #103 from mattjbarlow/racker-bobg_Dev

adding joshrichards.txt
Merge pull request #104 from mattjbarlow/staging

Staging