afa
Merge branch 'master' of https://github.com/lmalik12/GALT

Conflicts:
data.sql
asd