fix
Merge branch 'master' of https://github.com/melatron/TeamPowerPuffGirls

Conflicts:
	js/Objects.js
	js/story.js