Merge pull request #1 from konradk2/master

aktualizacja
partial template integration
Merge pull request #2 from konradk2/templates

Templates
templating finished
Merge pull request #4 from mkulinska/master

implements #3