added about.html page 

submitting about.html (sooo happy!!), however I still have the previous environment before Wednesday's meeting. Thanks for the review and suggested improvements. 

I will fetch&merge now all the changes from Wednesday's meeting and try to upgrade the about.html in accordance with current goals. 
Thank you!!!
that's because you didn't merge them correctly... those lines are left behind when merge conflicts occur and you are expected to resolve those before you commit them again :smile: 
I'm guessing this was one of the steps that git told you to do, but you didn't :wink: 

here, some documentation on [resolving merge conflicts](https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/)