Merge Conflicts

Making merge conflicts
trying merge conflicts
Change title to index.htm

Title for index changed to learn about merge conflicts
problems solved
Merge pull request #2 from CRONOZ09/merge-conflicts

Merge conflicts