My commit
Merge pull request #1 from Peppson/master

First pull request
Third commit
Merge pull request #2 from Peppson/master

Second festure merged