Fixed null pointer in GameModel since IDs are now the same
Merge branch 'dev' of https://github.com/CSc436/Project-4x into dev
Fixed bug where resources weren't generating due to small timestep
Merge branch 'dev' of https://github.com/CSc436/Project-4x.git into dev