Correct .gitignor
Merge branch 'master' of https://github.com/DanielKeogh/SettingThingsOnFire

Merging changes
Implementation of the spreading algorithm
Merge branch 'master' of https://github.com/DanielKeogh/SettingThingsOnFire

Merging changes