Merge pull request #1 from tekkikat/master

added extra line to another.html
added line 3 another.html
fixed merge conflicts
added line 7