init commit
Merge branch 'master' into controllers_test_k
add some test
Merge branch 'master' into controllers_test_k
add some tests
fixing some merge conflict
Merge pull request #25 from dmitryshilin/controllers_test_k

Controllers test k