Added Extra
Added Thumbs.db
Fixed merge conflict