pull
Merge remote-tracking branch 'origin/master'

Conflicts:
	your-project-name/app/routes.php