fixed location issues and sql query
Merge branch 'A2' of https://github.com/qaiseraftab/csc309