Add Thumbs.db in .gitignore
Refactoring to take loading map into account
Fix conflict