chenges after VG meeting
SQL added
Merge branch 'lab'