Added about page
Merge fix