testin
adding thumbs.db to list of ignored files to keep them from accidental commit
fix merge conflict