Added nginx and personal config
merged conflict