edit property
Merge branch 'master' of https://github.com/soulski/ci-helloword