updating to reflect local changes
Merge branch 'master' of https://github.com/aBathologist/-um

Conflicts:
	public_html/tilde_ring/join.html

Resolved conflict between dan's and my updates to the join page. Nextime time:
more vigilant commitment!