Testing Git: added comments to file index.php file.
Edited README file.
Resolved a conflict.