baa
Merge remote-tracking branch 'origin/master'

Conflicts:
	classes.js
Merge branch 'master' of https://github.com/baszak/rpg_mk