no handin
Merge branch 'master' of https://github.com/jsingle/cuda_fire_simulator