init git
Merge branch 'master' of github.com:oohana/test_rest