Merge branch 'gh-pages'
Added timeout to fishing report. Changes km to miles in overview