Added testapp test file
Edited readme
Merge branch 'hotfix'
Added more text in hotfix branch
Added more text in master branch
Merged changes