coal, water 추가
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/engine.pde
Merge branch 'master' of https://github.com/shlee322/bluesky-online