Fixed the crash.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project