git reset test
Merge branch 'master' of github.com:lxyz/kohana