add dep
redistribute
add files
Merge branch 'master' of github.com:limijiaoyin/mahou-dojo

Conflicts:
	bower.json

	modified:   Gulpfile.js
	modified:   app.js
	modified:   lib/show.js
	modified:   public/css/style.css
	new file:   public/img/mask.png
	new file:   public/img/timer-tip-final.png
	new file:   public/img/timer-tip-playing.png
	new file:   public/img/timer-tip-wait.png
	new file:   public/img/timer_bg.png
	modified:   public/index.html
	modified:   public/js/magician.js
	modified:   public/js/require.config.js
	new file:   public/js/token.js
	modified:   scss/style.scss
	public/css/wait.css
	public/wait.html
redirect
bug fix
add serverside codes
jump another
Merge pull request #2 from PopPopRet/master

jump