init
Merge branch 'master' of ssh+git://github.com/tzachar/conf