Removed old files, changed deploy script to merge to master branch