Updating version
Merge branch 'master' of github.com:krasimir/techy
Merging conflict