updated some stuff
Merge branch 'master' of https://github.com/domain-/dumpster-critics-test-land