Get changes from master

Someone made changes to the master branch while I was working on my own feature branch

git commit ... # commit your changes
git rebase origin/master