s
cc

Conflicts:
	app/views/account/home1.blade.php
cc