init
Merge http://github.com/shimonm/sample_app