RESTORED *.lock files to .gitignore
DELETED <<<HEAD in index.html