three steps done
Merge branch 'personal/deniotokiari' of https://github.com/AStupiak/db-course-2014 into personal/deniotokiari