トラック
Merge branch 'master' of https://github.com/syupein/pbl1_A.git
変更戻す作業
Merge branch 'master' of https://github.com/syupein/pbl1_A.git
ログイン処理の結合
Merge branch 'master' of https://github.com/syupein/pbl1_A.git

Conflicts:
	app/Controller/UsersController.php