Mesclar Mestre em Feleure Branch

git checkout feature1
git merge master
Victorious Vulture