Fix crash on initialization
Merge branch 'master' of https://github.com/CMPUT301F13T06/ClassProject