cleanup
Merge branch 'master' of github.com:culvertsoft/mgen
Merge remote-tracking branch 'origin/master' into javascript-remake