tmp commit
Added feromons to map
Merge remote-tracking branch 'origin/master'