test2 added

- blabla 2
Fix added
Merge branch 'hotfix'
Merge branch 'master' of https://github.com/buskovic/mytest