Edit mandatory conflict blurb
re-edit conflict blurb and add in http
make welcome page responsive

(quick fixes, will polish more later)
Add and style welcome-modal with 1st time help

triggers on entry and also with clicking "Help"
Merge remote-tracking branch 'origin/gh-pages'