attemtping to resolve a merge?
Merge branch 'master' of https://github.com/Ellyonia/DB-GUI