Merge branch 'together-for-fun' into nginx

diff --cc INSTALL.sh
Simple merge

diff --cc web/Obj/brisk.phh
Simple merge

diff --cc web/Obj/sac-a-push.phh
Simple merge

diff --cc web/briskin5/index_wr.php
Simple merge

diff --cc web/index_wr.php
Simple merge