save
save
Merge pull request #2 from PopPopRet/master

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

Conflicts:
	app.js
	bower.json
	public/js/magician.js
yet another jump