index modify
count
count
count
	modified:   game/main.js
	modified:   game/main.js
implement the defend attack bonous
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project

Conflicts:
	game/main.js
debugging
debugging
modified update_slot.js
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
1. implements a quit game button
2. initial resources now 30,30
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
debugging
debugging
debugging
 Please enter the commit message for your changes. Lines starting
debugging
modified update_slot.js