lab 1-2
Merge branch 'personal/Griffond' of https://github.com/AStupiak/db-course-2014 into personal/Griffond