Jano Devel Task 1
Jano Devel Task 2
Merge remote-tracking branch 'origin/master'