Merge branch 'master' of https://github.com/JERRYCCC/JCClubHub

Conflicts:
	.gitignore
k