fixing a bunch of broken links and a broken image
Fixed conflicts
Merge branch 'nevanscott-fixlinks'