ania zmiany
Merge origin/master

Conflicts:
	access.log
	app/routes.php
	app/views/example.blade.php
	app/views/home.blade.php
	app/views/layouts/base.blade.php
	error.log