Finally done
Merge branch 'master' of https://github.com/Kygandomi/RBE2002

Conflicts:
	FireFight/Flame.h