Testing the new branch
Added new feature
Some other thing added
Merge pull request #1 from floorman/dev

Dev