Cleans up master branch to be up-to-date with dev branch