start join button css style
Merge branch 'master' of github.com:mrdre/mfc

Conflicts:
	lib/template/loggedIn.html
Merge branch 'master' of github.com:mrdre/mfc 1111

Conflicts:
	lib/template/loggedIn.html