Fixed folder structure
Resolve conflict
Fixed checkstyle errors
Merge pull request #17 from kirill-kornyakov/Daniil-Osokin-add_lab1_to_build

Daniil Osokin: add lab1 to build