Commit 8dc6e757 authored by Isabella Skořepová's avatar Isabella Skořepová

Merge branch 'a1-contest-2017' into 'master'

A1 contest 2017

See merge request !46
parents 944f6254 e9974bf6
Pipeline #777 passed with stage
in 2 minutes and 43 seconds