save
Merge branch 'master' of github.com:limijiaoyin/mahou-dojo
save
save
Merge branch 'master' of github.com:limijiaoyin/mahou-dojo

Conflicts:
	lib/fake.js