figuring out git conflicts
Merge branch 'master' of github.com:HowHai/j0bD