Fixing more things from my code that was in another version
Linking
Merge branch 'master' of github.com:curdog/hw1