Add helpful commentary
Add second feature
Merge branch 'feature_2'