Init
Merge branch 'master' of github.com:timukasr/assignment-two