no message
Merge branch 'master' of https://github.com/fmy/kinokore

Conflicts:
	stone.js
no message
no message
Merge branch 'master' of https://github.com/fmy/kinokore
add mountain