Resolving github conflicts

Now working again
Merge branch 'master' of https://github.com/Morlackless/Smoke-B-Gone