link back to home on show page
git pull conflict fix
about text
fix merge conflicts
about page and smooth scroll