no changes
removing conflicts

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