fixed .gitignore
Merge branch 'master' of github.com:Zojax/zojax.cms