Linking stuff
Merge branch 'master' of https://github.com/Flippinunit/CS151