Fixing merge

merge
Merge branch 'master' of https://github.com/dbigelow25/scaha