"Galen's read me file"
Merge branch 'master' of https://github.com/ghughes7/repository
"merging branches so I can commit"
Merge branch 'master' of https://github.com/ghughes7/repository