User -> Users
User -> Users
users
* 強豪解除テスト
Merge branch 'master' of https://github.com/syupein/pbl1_A.git

Conflicts:
	app/Config/core.php