Rename so I can merge branches
Merge pull request #1 from Helseth/master

Rename so I can merge branches