fixed null pointer. if our methods work then were basically done
Merge branch 'master' of https://github.com/Montezumas/project2