fixed null
Merge branch 'master' of https://github.com/CMPUT301f14t05/CorgFu