Merge branch 'master' of https://github.com/HubertJedrzejek/laravel-base

Conflicts:
	.gitignore