More work on thread manager
Merge branch 'threadManager' of https://github.com/CMPUT301W14T08/GeoChan into threadManager
More work on thread manager