strating the sql file merge
Merge branch 'master' of https://github.com/ggadmin/hs_manager
Adding files. starting sql merge. This is currently a gorram mess.