Cleaning out the old folder
Upping version
Merge remote-tracking branch 'origin/master'