Added about page
Changes to about page
Fix merge conflicts
Merge pull request #124 from rsoto1/about_page

About page