Merge branch 'master' into develop
more updates to nginx content
Merge branch 'develop' of github.com:fideloper/serversforhackers into develop
Merge branch 'develop'