"Added version trees to join.html"
"Added versions tree to join.html"
Merge remote-tracking branch 'origin/Gal'

Conflicts:
	.idea/workspace.xml
	CSS/index.css