commit
Merge remote-tracking branch 'origin/forms'

Conflicts:
	app/views/index.blade.php