Challenge 5
Merge branch 'master' of github.com:rackerjimmy/DevOps-Challenges-Cycle1

Conflicts:
	challenge1.php