Merge branch 'Pexi-edit'
Merge branch 'master' of https://github.com/tetsuki/CSS3tehtava