styled task show page
fixed merge conflict
Merge pull request #35 from gyermich/galina

Galina