Merge branch 'master' of https://github.com/ticjaestic/ticwebkit

Conflicts:
	.gitignore
	app/storage/logs/laravel.log
Merge branch 'master' of https://github.com/ticjaestic/ticwebkit

Conflicts:
	.gitignore
	app/storage/logs/laravel.log
Conflicto con GitIgnore