Deleted node modules folder to avoid conflicting with local versions
Merge remote-tracking branch 'origin/master'