Updated slot machine.
Merge branch 'master' of github.com:/LiangMingyang/slotMachine

Conflicts:
	static/action.js