Merge from master

git checkout master
git pull
git checkout <your branch_name>
git merge master