Changes made in Branch 2
Merge pull request #1 from wtimson/Branch2

Accepting "Changes made in Branch 2"