add nginx.conf
add dir
Merge pull request #2 from orvice/master

Merge pull request #1 from orvice/dev
Merge pull request #3 from orvice/dev

Dev