changed merge for true plugin site-deploy
Merge pull request #23 from camilolopes/master

changed merge for true plugin site-deploy