add about
merge conflict
Merge pull request #3 from jimmyhchan/newDocs

about page