Added nginx cookbook
Added cookbooks
Resolved merge conflict
Additional cookbooks