adding about page
fixing merge conflicts
Merge pull request #38 from vlee90/andrew-branch

adding about page