- Moved nginx.conf into nginx/
Merge branch 'master' of github.com:davidkirwan/ds-sinatra-puma