Delete Capfile~
Delete deploy.rb~
Delete nginx.conf~
Delete unicorn_init.sh ~
Delete secrets.yml~
Delete unicorn.rb~
Merge branch 'master' of https://github.com/Francieudo/comments_service

Conflicts:
	config/nginx.conf~
	config/unicorn.rb~
	config/unicorn_init.sh ~