really not changed things
gitignore merge conflict resolved
Dot image in 6 reindeer colors