init
Merge branch 'master' of https://github.com/maniart/webapp-jam
ini