full arbeit
Merge branch 'master' of https://github.com/psmarcin/praktykapawla

Conflicts:
	index.html