zmiany
Merge branch 'master' of https://github.com/marcinf/php_framework

Conflicts:
	index.php