not sure why my error is on a line that my file doesn't have...
Merge branch 'master' of https://github.com/techjeffharris/cluster-fuck