my commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/index/register.blade.php