Fixed Loading
Merge pull request #58 from CMPUT301F13T05/threading

Fixed Loading