Master: git_test This is a playground for learning Git workflows. Master advanced since the feature was created. Feature 1 was updated with changes from master then merged.