merge branch
Merge branch 'master' of https://github.com/lawsonk1215/QlfHfgaQot
whole bunch of stuff