Merge pull request #1 from crazy-grizzly/new-cool-feature

Test commit from new branch
First commit from another new branch
Merge pull request #2 from crazy-grizzly/second-cool-feature

Second cool feature