fast coding
shifting stagess
sd
fixed name
Merge branch 'master' of github.com:wesleytsai/goodgame into kai

Conflicts:
	main.js