tes git in sublime text
Merge branch 'master' of github.com:nyankod/pusakacms