Had to change the first line, it had a CR in it
Merge branch 'master' of https://github.com/draythomp/Desert-Home-RPi