Added Laravel.
Merge remote-tracking branch 'github/master'

Conflicts:
	.gitignore
	composer.json