Fixed Null pointers
Merge branch 'master' of https://github.com/abcde13/CS111
Compare testing almost done