second commit
deleted
Merge branch 'master' of https://github.com/makos88/testapp