login, join
Merge branch 'master' of https://github.com/k-nishioka/F-chi

Conflicts:
	public_html/header.html
	public_html/index.php