First commit in new branch
Merge pull request #1 from highhat/Test-Branch

First merging of branches