Master updated
Merge remote-tracking branch 'origin/BranchTest1'
Merged BranchTest1
Merge pull request #1 from CasperWollesen/BranchTest1

My latest changes.
Master 2 committed
Merge pull request #2 from CasperWollesen/master

Get Master into BranchTest1