setting paths to relative
Merge remote-tracking branch 'origin/master'
setting paths to relative