Committing Laravel framework
Merge branch 'master' of https://github.com/andrewjroberts/portfolio

Conflicts:
	.gitignore