Merge pull request #2 from jimmyhchan/newDocs

About page
add about
merge conflict