App
Merge branch 'master' of https://github.com/magoswiat/Skarpetuszka
Ojoj
Merge branch 'master' of https://github.com/magoswiat/Skarpetuszka

Conflicts:
	vendor/autoload.php
	vendor/composer/autoload_real.php