updates
Merge branch 'master' of https://github.com/dyarbrough93/2d-engine.js